Commit Graph

46587 Commits

Author SHA1 Message Date
Jeff Brown
27d928474d am dce1547d: am 9e2e781a: Merge "Remove unused statistics code." into jb-dev
* commit 'dce1547d65877b89cec4e52ee8e5b39830911d00':
  Remove unused statistics code.
2012-05-31 18:43:26 -07:00
Jeff Brown
dce1547d65 am 9e2e781a: Merge "Remove unused statistics code." into jb-dev
* commit '9e2e781acaead54d0fb095d55a1c44b32563248f':
  Remove unused statistics code.
2012-05-31 18:41:14 -07:00
Jeff Brown
9e2e781aca Merge "Remove unused statistics code." into jb-dev 2012-05-31 18:39:02 -07:00
Eino-Ville Talvala
1737e57a86 Add camera as an ATRACE tag
Change-Id: Ib4f22d593836c4b973d122efa114d359f1529914
2012-05-31 15:57:39 -07:00
Jeff Brown
1ea51bf519 Remove unused statistics code.
Bug: 6559630
Change-Id: Iacdf4bb4c1c125c09305cbd8cb443c7c80cfc010
2012-05-30 19:17:47 -07:00
Jamie Gennis
1401ad526c Add the EGL_ANDROID_fence_sync spec.
Change-Id: I8c26e5caaf8d89a60a09a5308d55e336537b916e
2012-05-30 16:34:32 -07:00
The Android Open Source Project
24adb709b7 am 0fda2cce: Reconcile with jb-release
* commit '0fda2cce44cd49f16d50ed618c954e12e453f920':
2012-05-30 10:21:50 -07:00
The Android Open Source Project
0fda2cce44 Reconcile with jb-release
Change-Id: If0a430615dadb425b82aa27204e6c670f06ee099
2012-05-30 10:15:16 -07:00
The Android Automerger
8c09d0d80d merge in jb-release history after reset to jb-dev 2012-05-30 07:03:19 -07:00
Mathias Agopian
7312f864f8 am 79f2e1af: am e31564d8: Fix a crasher is surfaceflinger.
* commit '79f2e1afbc08cd0cbcddc70cde5e3b7f1f0afea4':
  Fix a crasher is surfaceflinger.
2012-05-29 21:09:04 -07:00
Mathias Agopian
79f2e1afbc am e31564d8: Fix a crasher is surfaceflinger.
* commit 'e31564d8eb0ab67e167a888eccce20f5b4e4ef45':
  Fix a crasher is surfaceflinger.
2012-05-29 21:06:55 -07:00
Mathias Agopian
e31564d8eb Fix a crasher is surfaceflinger.
this bug introduced recently would happen when the very first
buffer of a surface was rejected for not having the right size

Bug: 6577035
Change-Id: I9fabf20006019f2a6c308be7c7f5c05bdcfd5014
2012-05-29 20:41:03 -07:00
Mathias Agopian
2466e402a0 am 584fcb32: am 2c8207e9: add the ability to reject buffers in SurfaceTexture::updateTexImage
* commit '584fcb3218e07d7b4cc0aeaef41faa4e891b45a4':
  add the ability to reject buffers in SurfaceTexture::updateTexImage
2012-05-29 19:53:52 -07:00
Mathias Agopian
9f36ebdb5b am c7c8334f: am 702634a4: refactoring in preparation for bug:6498869 fix
* commit 'c7c8334f059e42106c7cfa27cdead277fd5e135d':
  refactoring in preparation for bug:6498869 fix
2012-05-29 19:53:50 -07:00
Mathias Agopian
61250a3cd6 am f67148ec: am 05cec9d1: improve resize transactions
* commit 'f67148eccd54a9529e9e65c0f1bc07f1abd01fb6':
  improve resize transactions
2012-05-29 19:53:49 -07:00
Mathias Agopian
ff81b732b3 am b18d747e: am 419e196e: Improve debug logs and minor clean-up
* commit 'b18d747ef6ddf5d140221e32a287a5238f729612':
  Improve debug logs and minor clean-up
2012-05-29 19:53:47 -07:00
Mathias Agopian
584fcb3218 am 2c8207e9: add the ability to reject buffers in SurfaceTexture::updateTexImage
* commit '2c8207e9627fe6c7a90e31fae8d71ae49df56845':
  add the ability to reject buffers in SurfaceTexture::updateTexImage
2012-05-29 19:50:58 -07:00
Mathias Agopian
c7c8334f05 am 702634a4: refactoring in preparation for bug:6498869 fix
* commit '702634a4dad85cfc292618ac91eda6c00f42b7c5':
  refactoring in preparation for bug:6498869 fix
2012-05-29 19:50:57 -07:00
Mathias Agopian
f67148eccd am 05cec9d1: improve resize transactions
* commit '05cec9d1275fd939c2d1aec235dca2bdb8edef63':
  improve resize transactions
2012-05-29 19:50:55 -07:00
Mathias Agopian
b18d747ef6 am 419e196e: Improve debug logs and minor clean-up
* commit '419e196e639c8adb875da2765abcef95017b6d4a':
  Improve debug logs and minor clean-up
2012-05-29 19:50:54 -07:00
The Android Open Source Project
db3164091e am 65838c52: Reconcile with nakasi-factoryrom-release
* commit '65838c52fa47cd4b7adf2ca0c27ed26376acc6c5':
2012-05-29 09:44:58 -07:00
The Android Open Source Project
65838c52fa Reconcile with nakasi-factoryrom-release
Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a
2012-05-29 09:41:02 -07:00
The Android Automerger
9f63d6fece merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-24 10:17:56 -07:00
The Android Open Source Project
e718d80e73 am 227d45ea: Reconcile with jb-release nakasi-factoryrom-release
* commit '227d45ea2b9ccade09fd620d028e992ff1140b99':
2012-05-24 09:04:10 -07:00
The Android Open Source Project
227d45ea2b Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I3bc06420f32fe0ce50b6943fe33eca293f375d05
2012-05-24 09:01:16 -07:00
Mathias Agopian
2c8207e962 add the ability to reject buffers in SurfaceTexture::updateTexImage
SurfaceFlinger is using this new feature to reject buffers that
don't have the right size.

Bug: 6498869
Change-Id: I8a7250a47db6c082a357b703feb3b9d0fc8d3443
2012-05-23 18:01:33 -07:00
Mathias Agopian
702634a4da refactoring in preparation for bug:6498869 fix
here we just shuffle a bit the code inside lockPageFlip(),
we move the code that handles the buffer size closer to the call
to updateTexImage(). no functionality change.

Change-Id: Ie3193cd86cd32cf3c89532449fd747d145ca0ab6
2012-05-23 18:01:33 -07:00
Mathias Agopian
05cec9d127 improve resize transactions
use a flag instead of pre-committing the "requested" state
to prevent propagation or "requested" to "active", which makes
things a lot clearer when reading the code.

also avoid going through the "resized" code-path when requested
size is equal to "active" size.

Bug: 6498869
Change-Id: I24f893ba0ec5ca06aac5b8da9818989ae7ce4005
2012-05-23 18:01:24 -07:00
Mathias Agopian
419e196e63 Improve debug logs and minor clean-up
Bug: 6498869
Change-Id: I14d1b4d6960b87b5a7c4d7e20b92538edd9331ff
2012-05-23 18:01:14 -07:00
The Android Automerger
58ef7675a1 merge in jb-release history after reset to jb-dev 2012-05-23 07:02:43 -07:00
Jesse Hall
c20bd43b8a am 138a8d75: am e1082496: Enable SurfaceTexture fence sync for the emulator
* commit '138a8d7510e6ba8a402ffacc38c7cc5bfaa5e571':
  Enable SurfaceTexture fence sync for the emulator
2012-05-22 21:29:27 -07:00
Jesse Hall
138a8d7510 am e1082496: Enable SurfaceTexture fence sync for the emulator
* commit 'e10824965c64663b8878b808206ee382c7ab6af8':
  Enable SurfaceTexture fence sync for the emulator
2012-05-22 21:27:13 -07:00
Todd Poynor
29e27a84c1 dumpstate: Add kernel wakeup sources info
Change-Id: I0f95afd6815c1403d8400a18ef3cd19d936d4601
2012-05-22 18:26:47 -07:00
Jesse Hall
e10824965c Enable SurfaceTexture fence sync for the emulator
The host-accelerated GL ES driver doesn't do the implicit
synchronization required when fence sync isn't used.

Bug: 6515813
Change-Id: I6a667f2db6b519f3557b5abda78775f767841dae
2012-05-22 16:46:17 -07:00
Jesse Hall
474937a5ed am 1974391b: am 83e7c8c4: Implement the EGL_KHR_fence_sync in libagl
* commit '1974391ba8d47a6f9468e2e72bd688dc48d3b827':
  Implement the EGL_KHR_fence_sync in libagl
2012-05-22 16:09:27 -07:00
Jesse Hall
1974391ba8 am 83e7c8c4: Implement the EGL_KHR_fence_sync in libagl
* commit '83e7c8c431ec8b578b6f778811837632e3798768':
  Implement the EGL_KHR_fence_sync in libagl
2012-05-22 16:07:25 -07:00
The Android Open Source Project
a326aa2c85 am 7afcf632: Reconcile with jb-release
* commit '7afcf63296319d2d4b9ca716e05f329a6e0e3b34':
2012-05-22 14:21:17 -07:00
The Android Automerger
4c8d9d5f8d merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-22 13:24:05 -07:00
The Android Open Source Project
7afcf63296 Reconcile with jb-release
Change-Id: I37477f9871208d227b42937c5aa7d27129bdecb1
2012-05-22 13:06:34 -07:00
Jesse Hall
83e7c8c431 Implement the EGL_KHR_fence_sync in libagl
Implementing this in libagl allows us to start using it for
SurfaceTexture in emulator builds, which is necessary to avoid
corruption in the Browser when using the host-accelerated GL path.

Bug: 6515813
Change-Id: Icafba8687cb5d010d8d42b3866b298d2be984fc9
2012-05-22 12:11:41 -07:00
The Android Automerger
80bfdb06b8 merge in jb-release history after reset to jb-dev 2012-05-22 07:05:42 -07:00
Mathias Agopian
ae5df74c32 am 4ae4e6f2: am cc2b1560: fix EGL_CLIENT_STRING
* commit '4ae4e6f2da480b31b5e545e9179cb6881893d7b9':
  fix EGL_CLIENT_STRING
2012-05-21 14:32:58 -07:00
The Android Open Source Project
b19c17f8a5 am 3d8added: Reconcile with jb-release nakasi-factoryrom-release
* commit '3d8addedff14f2b85f89eb1a2ea24edb249a470b':
2012-05-21 14:28:46 -07:00
Mathias Agopian
69df645759 am 83f1d839: am 7e477bfe: make sure BufferQueue releases newly acquired buffers on failures
* commit '83f1d83975345bada9886e9ea0ef2b950d90cd77':
  make sure BufferQueue releases newly acquired buffers on failures
2012-05-21 14:27:29 -07:00
Mathias Agopian
4ae4e6f2da am cc2b1560: fix EGL_CLIENT_STRING
* commit 'cc2b1560e87369676a2d13f17bd1ff4021a91819':
  fix EGL_CLIENT_STRING
2012-05-21 14:15:00 -07:00
Mathias Agopian
49b97c857e am ac4a4825: am f899e411: Remove misleading and wrong ALOGW
* commit 'ac4a48251180a79ae19e3a7112537c3d0fa260c6':
  Remove misleading and wrong ALOGW
2012-05-21 14:11:46 -07:00
Mathias Agopian
ff5ed84178 am 1783e6f2: am ed9807bd: we need to wait for vsync when doing the screen-off animation
* commit '1783e6f2e1f4543590009c36c83a79f4c42b3c9e':
  we need to wait for vsync when doing the screen-off animation
2012-05-21 14:11:41 -07:00
Mathias Agopian
cc2b1560e8 fix EGL_CLIENT_STRING
it should read OpenGL_ES (with an underscore)

Bug: 6529643

Change-Id: I7caf07793bffe5a8dcceaff496a222077486fc87
2012-05-21 14:02:53 -07:00
Jeff Sharkey
4d4079b984 am 82e7812a: am a66faaa6: Merge "Dump packages.xml as root." into jb-dev
* commit '82e7812ab1e09170106a836c143365b3662ff823':
  Dump packages.xml as root.
2012-05-21 12:45:09 -07:00
Mathias Agopian
455961ef65 am e0607f05: am 5aed6843: Merge "fix a corruption in Vector<> when adding new items" into jb-dev
* commit 'e0607f0507fe647bd9262facfaf75146c074e933':
  fix a corruption in Vector<> when adding new items
2012-05-21 12:43:25 -07:00