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
4467bba73a
Merge "Support looper callbacks based on smart pointers." into jb-dev
2012-05-31 18:39:13 -07:00
Jeff Brown
dad2378911
Merge "Delete unused poll() code." into jb-dev
2012-05-31 18:39:06 -07:00
Jeff Brown
9e2e781aca
Merge "Remove unused statistics code." into jb-dev
2012-05-31 18:39:02 -07:00
Jeff Brown
af567f73ac
Support looper callbacks based on smart pointers.
...
Bug: 6559630
Change-Id: I5a667f219f431838638acefbc9fa6afa610971bd
2012-05-31 17:16:21 -07:00
Jeff Brown
588d5c8280
Delete unused poll() code.
...
We don't need this code anymore and it is just in the way.
Bug: 6559630
Change-Id: I1dc9decf85d5ea1feab159c2985da6c20baffdd5
2012-05-30 19:21:12 -07:00
Jeff Brown
1ea51bf519
Remove unused statistics code.
...
Bug: 6559630
Change-Id: Iacdf4bb4c1c125c09305cbd8cb443c7c80cfc010
2012-05-30 19:17:47 -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
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
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
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
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
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
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
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 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
4ae4e6f2da
am cc2b1560
: fix EGL_CLIENT_STRING
...
* commit 'cc2b1560e87369676a2d13f17bd1ff4021a91819':
fix EGL_CLIENT_STRING
2012-05-21 14:15:00 -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
The Android Automerger
be08a243d1
merge in jb-release history after reset to jb-dev
2012-05-20 07:39:46 -07:00
The Android Open Source Project
3d8addedff
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I42366ee22738eac90627669da9bb03ec8b598724
2012-05-18 18:43:36 -07:00
Mathias Agopian
83f1d83975
am 7e477bfe
: make sure BufferQueue releases newly acquired buffers on failures
...
* commit '7e477bfe11f8bb31622353b64e85721df3cf9702':
make sure BufferQueue releases newly acquired buffers on failures
2012-05-18 17:11:23 -07:00
Mathias Agopian
7e477bfe11
make sure BufferQueue releases newly acquired buffers on failures
...
this prevents SurfaceTexture producer to hang in dequeueBuffer()
when something goes wrong in the consumer.
only the consumer gets an error and the current frame is kept
instead of the new one. the producer is unaware of the problem.
Bug: 6476587
Change-Id: Ie6db5526632aabc3e60229b93dfe29c19491ade4
2012-05-18 16:50:58 -07:00
Mathias Agopian
ac4a482511
am f899e411
: Remove misleading and wrong ALOGW
...
* commit 'f899e4113a5b5545cd91b4625514d0ab0d33751c':
Remove misleading and wrong ALOGW
2012-05-18 15:59:24 -07:00
Mathias Agopian
1783e6f2e1
am ed9807bd
: we need to wait for vsync when doing the screen-off animation
...
* commit 'ed9807bd7dbd4863841e251138392c54755eb394':
we need to wait for vsync when doing the screen-off animation
2012-05-18 15:59:23 -07:00
Mathias Agopian
f899e4113a
Remove misleading and wrong ALOGW
...
Bug: 6476587
Change-Id: I4345f1100db02786bb50ad83ca7b559cad301706
2012-05-18 15:32:28 -07:00
Mathias Agopian
ed9807bd7d
we need to wait for vsync when doing the screen-off animation
...
Bug: 6511421
Change-Id: I7a85a55e66a3a8d9937df575e98a5efec01a634f
2012-05-18 14:30:40 -07:00
Jeff Sharkey
82e7812ab1
am a66faaa6
: Merge "Dump packages.xml as root." into jb-dev
...
* commit 'a66faaa65a235e24e78f75c79cc3bd209b67e1f8':
Dump packages.xml as root.
2012-05-18 14:21:40 -07:00
Jeff Sharkey
a66faaa65a
Merge "Dump packages.xml as root." into jb-dev
2012-05-18 11:40:49 -07:00
The Android Automerger
4784b6c428
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:47:59 -07:00
Mathias Agopian
e0607f0507
am 5aed6843
: Merge "fix a corruption in Vector<> when adding new items" into jb-dev
...
* commit '5aed68434d11d609039a89594ad5faa01060a1d6':
fix a corruption in Vector<> when adding new items
2012-05-17 17:49:46 -07:00
Mathias Agopian
5aed68434d
Merge "fix a corruption in Vector<> when adding new items" into jb-dev
2012-05-17 17:48:09 -07:00
Mathias Agopian
a9611c5d5b
fix a corruption in Vector<> when adding new items
...
would happen when vectors are copied and new items is
added in both vectors. we didn't duplicate the underlying
storage when adding items in vectors.
Bug: 6515797
Change-Id: If544c07d96c05821e088d7f2c9b5736f7e306c31
2012-05-17 17:47:44 -07:00
Jeff Sharkey
13461c2ffe
Dump packages.xml as root.
...
Bug: 6501151
Change-Id: Ied638bdbe9ed6fbf749a44de8ac1f9d4167829c1
2012-05-17 13:03:34 -07:00
Jesse Hall
bd56aabb92
am 515f19da
: Merge "Recreate EGLImage for previously used slots" into jb-dev
...
* commit '515f19da246a11c417c1771d4293e753f09e79b6':
Recreate EGLImage for previously used slots
2012-05-17 12:09:50 -07:00
Jesse Hall
515f19da24
Merge "Recreate EGLImage for previously used slots" into jb-dev
2012-05-17 12:07:39 -07:00
Jesse Hall
90ed8508ed
Recreate EGLImage for previously used slots
...
SurfaceTexture would only create an EGLImage for a buffer slot when
BufferQueue returns a GraphicBuffer, i.e. either the slot was acquired
for the first time ever, or the buffer for the slot was reallocated.
But the EGLImage may also need to be re-created for a
previously-acquired buffer if the slot's EGLImage was destroyed during
detachFromContext(); in this case BufferQueue won't return a
GraphicBuffer since SurfaceTexture already has a reference to the
correct buffer.
Bug: 6461693
Change-Id: Ib95d0d757192efe336c5fda0866f857481a6617d
2012-05-17 11:25:21 -07:00