OSDN Git Service
Mathias Agopian [Wed, 21 Aug 2013 22:59:20 +0000 (15:59 -0700)]
am
4ceff3d5: screenshot layers wouldn\'t work in some cases
* commit '
4ceff3d5efd27c164788bb2b3f0fd17c691a0204':
screenshot layers wouldn't work in some cases
Mathias Agopian [Wed, 21 Aug 2013 22:23:15 +0000 (15:23 -0700)]
screenshot layers wouldn't work in some cases
specifically when the display size and the screenshot window
size didn't match, the buffer would be rejected.
We simply fix this by setting the scalling mode to
"SCALE_TO_WINDOW".
Bug:
9992306
Change-Id: Ib821767899af330bb70d3cbbfa7d41b02794a075
Dmitry Shmidt [Wed, 21 Aug 2013 19:38:25 +0000 (12:38 -0700)]
am
56968ec0: Merge "dumpstate: Fix wifi list of networks dump" into klp-dev
* commit '
56968ec0bfbe70b76193a2614a23beacfc9cf9dc':
dumpstate: Fix wifi list of networks dump
Dmitry Shmidt [Wed, 21 Aug 2013 19:35:25 +0000 (19:35 +0000)]
Merge "dumpstate: Fix wifi list of networks dump" into klp-dev
Mathias Agopian [Wed, 21 Aug 2013 18:56:48 +0000 (11:56 -0700)]
am
a525483d: Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev
* commit '
a525483dc73df39a72c9b4865102a86704b3622c':
Fix a bug where non-cropped layer could be scaled incorrectly
Mathias Agopian [Wed, 21 Aug 2013 18:55:19 +0000 (18:55 +0000)]
Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev
Dmitry Shmidt [Wed, 21 Aug 2013 17:58:29 +0000 (10:58 -0700)]
dumpstate: Fix wifi list of networks dump
Bug:
9056601
Change-Id: Ia0adb67afdf3d478033d0ee34bbb95e621e2fe51
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Jesse Hall [Wed, 21 Aug 2013 14:41:23 +0000 (07:41 -0700)]
am
d2cf8c2f: Merge "Provide HWC prepare with a valid output buffer" into klp-dev
* commit '
d2cf8c2f07b4285a224acd262e6f052c37dbc0b0':
Provide HWC prepare with a valid output buffer
Jesse Hall [Wed, 21 Aug 2013 14:41:23 +0000 (07:41 -0700)]
am
7127d17d: Merge "Fix HWComposer dumping of float source crops" into klp-dev
* commit '
7127d17db148ad388a4eb3c152d4c257c6015476':
Fix HWComposer dumping of float source crops
Jesse Hall [Wed, 21 Aug 2013 14:38:51 +0000 (14:38 +0000)]
Merge "Provide HWC prepare with a valid output buffer" into klp-dev
Jesse Hall [Wed, 21 Aug 2013 14:37:50 +0000 (14:37 +0000)]
Merge "Fix HWComposer dumping of float source crops" into klp-dev
Andy McFadden [Wed, 21 Aug 2013 14:33:46 +0000 (07:33 -0700)]
am
32551478: Merge "Fix virtual displays for HWC 1.0" into klp-dev
* commit '
32551478fc5417d3b7b5e33a202eb6ca66061f7d':
Fix virtual displays for HWC 1.0
Andy McFadden [Wed, 21 Aug 2013 14:31:34 +0000 (14:31 +0000)]
Merge "Fix virtual displays for HWC 1.0" into klp-dev
Mathias Agopian [Wed, 21 Aug 2013 04:41:07 +0000 (21:41 -0700)]
Fix a bug where non-cropped layer could be scaled incorrectly
If a layer is not cropped but its bounds are outside of the
viewport (i.e.: clipped), the crop rectangle passed to
hw composer would be invalid because it started invalid
in the first place (to indicate "no crop").
Bug:
10410944
Change-Id: I4ae4d49a1adef0be7fa4304ecf84b1a5b7d03fe0
Jesse Hall [Tue, 20 Aug 2013 23:35:32 +0000 (16:35 -0700)]
Provide HWC prepare with a valid output buffer
We weren't dequeing and setting the output buffer until just before
set(). This didn't allow HWC to make decisions in prepare() based on
the output buffer format, dimensions, etc.
Now we dequeue the output buffer at the beginning of the composition
loop and provide it to HWC in prepare. In GLES-only rendering, we may
have to cancel the buffer and acquire a new one if GLES requests a
buffer with properties different than the one we already dequeued.
Bug:
10365313
Change-Id: I96b4b0a851920e4334ef05080d58097d46467ab8
Jesse Hall [Tue, 20 Aug 2013 23:11:50 +0000 (16:11 -0700)]
Fix HWComposer dumping of float source crops
Change-Id: I45a9344b5fab17ccb54bebd01382d738a03860e6
Andy McFadden [Tue, 20 Aug 2013 23:04:47 +0000 (16:04 -0700)]
Fix virtual displays for HWC 1.0
We weren't swapping the buffers.
Bug
10366404
Change-Id: I43eb7648231bedf24899da6fc0d9acc09e0b047e
Mathias Agopian [Tue, 20 Aug 2013 21:36:37 +0000 (14:36 -0700)]
am
4f4f0943: SurfaceFlinger now runs in the process\'s main thread
* commit '
4f4f0943489d9113c66ac22b58cfba8c21dfa879':
SurfaceFlinger now runs in the process's main thread
Mathias Agopian [Tue, 20 Aug 2013 00:26:18 +0000 (17:26 -0700)]
SurfaceFlinger now runs in the process's main thread
it used to spawn its own thread and return the main thread
to the binder thread pool -- this was confusing the naming
of things in the kernel.
Bug:
10331839
Change-Id: I2d13a6d73409a38109300fcbe6a04b4c41cb5d00
Andy McFadden [Mon, 19 Aug 2013 16:51:16 +0000 (09:51 -0700)]
Andy McFadden [Mon, 19 Aug 2013 15:56:07 +0000 (08:56 -0700)]
Fix build
Neglected the "checkbuild"-built tests.
Change-Id: I202692f1a6d1e306c88e820c959d07d16e7c6a00
Andy McFadden [Mon, 19 Aug 2013 14:29:11 +0000 (07:29 -0700)]
am
90f59bf9: Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev
* commit '
90f59bf9eba79b27629505bc2709d84e7c811c8b':
Re-enable frame dropping for non-auto timestamps
Andy McFadden [Mon, 19 Aug 2013 14:27:28 +0000 (14:27 +0000)]
Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev
Jesse Hall [Sun, 18 Aug 2013 04:34:03 +0000 (21:34 -0700)]
am
7c6278de: Merge "Use new HWC display type/count constants." into klp-dev
* commit '
7c6278de6e2aed171362012d578d8bd093c8f280':
Use new HWC display type/count constants.
Jesse Hall [Sun, 18 Aug 2013 04:31:24 +0000 (04:31 +0000)]
Merge "Use new HWC display type/count constants." into klp-dev
Mathias Agopian [Sat, 17 Aug 2013 00:43:31 +0000 (17:43 -0700)]
am
0f05a926: Merge "Encapsulate textures into their own Texture class" into klp-dev
* commit '
0f05a926647389551aba6b8cfac37aaf73e8bad8':
Encapsulate textures into their own Texture class
Mathias Agopian [Sat, 17 Aug 2013 00:40:19 +0000 (00:40 +0000)]
Merge "Encapsulate textures into their own Texture class" into klp-dev
Mathias Agopian [Thu, 15 Aug 2013 01:20:17 +0000 (18:20 -0700)]
Encapsulate textures into their own Texture class
the main reason for doing this is so that we can have
access to informations about a texture (like its dimension)
close to where we generate and use shaders in ES 2.0.
Previously, there wasn't any way to get to a texture's size
from a RenderEngine implementation.
Bug:
8679321
Change-Id: I388b338a70d07e3e8177dde248710ea1e4c82dff
Andy McFadden [Fri, 16 Aug 2013 21:55:39 +0000 (14:55 -0700)]
Re-enable frame dropping for non-auto timestamps
This change adds an entire field to note whether the timestamp was
auto-generated by Surface or supplied by the application.
The value is used when deciding whether or not to drop frames based
on buffer presentation timestamps. If a desired presentation time
was set explicitly, BufferQueue will use that value to decide if a
frame should be dropped. If the timestamp was generated by Surface
at the time the buffer was queued, the timestamp is ignored.
Bug
10151804
Change-Id: Ibd571a7578351063b813cbdad2ddbeed70655ba5
Jesse Hall [Fri, 16 Aug 2013 21:53:51 +0000 (14:53 -0700)]
am
a33b62cc: Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev
* commit '
a33b62cc4700c68a3481d415a55e1a7b688981e1':
Replace sRGB_888 with sRGB_X_8888
Jesse Hall [Fri, 16 Aug 2013 21:50:22 +0000 (21:50 +0000)]
Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev
Jesse Hall [Fri, 16 Aug 2013 21:28:37 +0000 (14:28 -0700)]
Use new HWC display type/count constants.
Change-Id: I774d0c68906ac6dc69268f708c30a6b0868b8816
Igor Murashkin [Fri, 16 Aug 2013 21:07:10 +0000 (14:07 -0700)]
am
e60a0b1e: Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev
* commit '
e60a0b1e6a29d79b4d0ec0374446cb829bcadee4':
gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired
Igor Murashkin [Fri, 16 Aug 2013 21:02:01 +0000 (21:02 +0000)]
Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev
Jesse Hall [Fri, 16 Aug 2013 14:50:11 +0000 (07:50 -0700)]
Replace sRGB_888 with sRGB_X_8888
Bug:
10357459
Change-Id: I3a1d92cce2c9d3e930408129fb20887276fffddc
Jesse Hall [Thu, 15 Aug 2013 23:59:27 +0000 (16:59 -0700)]
am
e048a437: Merge "Add support for EGL_KHR_gl_colorspace" into klp-dev
* commit '
e048a4374c4e355c361f5eec0482ac85df0c73fe':
Add support for EGL_KHR_gl_colorspace
Mathias Agopian [Thu, 15 Aug 2013 23:59:25 +0000 (16:59 -0700)]
am
e0ec2a95: Merge "Fix ES2 composition on some devices" into klp-dev
* commit '
e0ec2a956840fa70387883f422b6020c1dfc6bad':
Fix ES2 composition on some devices
Mathias Agopian [Thu, 15 Aug 2013 23:59:24 +0000 (16:59 -0700)]
am
2eaefe19: Simplify handling of opaque layers in shader generation
* commit '
2eaefe198a0cae1ee0b6366797a6b074c76df9ef':
Simplify handling of opaque layers in shader generation
Jesse Hall [Thu, 15 Aug 2013 23:17:49 +0000 (23:17 +0000)]
Merge "Add support for EGL_KHR_gl_colorspace" into klp-dev
Mathias Agopian [Thu, 15 Aug 2013 23:12:26 +0000 (23:12 +0000)]
Merge "Fix ES2 composition on some devices" into klp-dev
Mathias Agopian [Wed, 14 Aug 2013 23:33:27 +0000 (16:33 -0700)]
Simplify handling of opaque layers in shader generation
just ensure the alpha value is 1.0 in the opaque case
when reading the color from the texture or the
global color.
Bug:
8679321
Change-Id: Ia38b30e97c3bce5a2d534a40c0d66e0bfc3ea40d
Mathias Agopian [Thu, 15 Aug 2013 21:56:51 +0000 (14:56 -0700)]
Fix ES2 composition on some devices
- turns out fragment shaders don't have default precision by default
- GLES 1.x extensions that became core in GLES 2.0 don't always work
as extensions in GLES 2.0 (!)
Bug:
8679321
Change-Id: I5a4a93e158247910399325a965af5d2e3bbece9b
Andy McFadden [Thu, 15 Aug 2013 17:45:04 +0000 (10:45 -0700)]
am
6db4ff62: Disable GLES 2.x rendering
* commit '
6db4ff621898573b41abf570271a04a13bd36a69':
Disable GLES 2.x rendering
Andy McFadden [Thu, 15 Aug 2013 17:39:11 +0000 (10:39 -0700)]
Disable GLES 2.x rendering
Bug
10340705
Change-Id: I91f3baf0d79655d8d031c100d0b116f745c2fbef
Andy McFadden [Thu, 15 Aug 2013 17:15:45 +0000 (10:15 -0700)]
am
892f22dc: Initialize mIndent
* commit '
892f22dcb96927b4a4f9ab7badd6f2c9f4f37c1f':
Initialize mIndent
Andy McFadden [Thu, 15 Aug 2013 17:05:01 +0000 (10:05 -0700)]
Initialize mIndent
Bug
10334731
Change-Id: Ia3aa118a1516cc480b0d85179b78c4447f982dd6
Igor Murashkin [Thu, 15 Aug 2013 01:49:12 +0000 (18:49 -0700)]
gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired
- Return NOT_ENOUGH_DATA instead of INVALID_OPERATION when too many
buffers have already been locked.
- INVALID_OPERATION is nominally used when something irrecoverable happens,
but in this case the client just needs to call unlockBuffer to go back into a
good state.
Bug:
10333400
Change-Id: I3a034d77de85741429f832a90eedd670afa1dc94
Mathias Agopian [Thu, 15 Aug 2013 01:28:48 +0000 (18:28 -0700)]
am
5bbe0ab6: fix build. optional test broke.
* commit '
5bbe0ab655713849fbfe750d4d09690106f95d7f':
fix build. optional test broke.
Mathias Agopian [Thu, 15 Aug 2013 01:22:02 +0000 (18:22 -0700)]
fix build. optional test broke.
Change-Id: I0ed5e2cd4c8945ee95673ed0eec5820d9def5097
Mathias Agopian [Wed, 14 Aug 2013 23:33:04 +0000 (16:33 -0700)]
am
c6bae007: Fix build. optional tests were broken.
* commit '
c6bae007e6e29b585fc1207f84b378a480006173':
Fix build. optional tests were broken.
Mathias Agopian [Wed, 14 Aug 2013 23:26:43 +0000 (16:26 -0700)]
Fix build. optional tests were broken.
Change-Id: Iba9f5cb57f134559e1f9c55e293578d9f5d8cb96
Mathias Agopian [Wed, 14 Aug 2013 22:45:22 +0000 (15:45 -0700)]
am
b2620900: Merge "don\'t reallocate the mesh each time we use it" into klp-dev
* commit '
b2620900a8be578dd3358606b26048a72bb2eb2d':
don't reallocate the mesh each time we use it
Mathias Agopian [Wed, 14 Aug 2013 22:45:21 +0000 (15:45 -0700)]
am
56f825e7: Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev
* commit '
56f825e7ab9f83706a74dcd4825c7bc839e49ae4':
SurfaceFlinger now uses GLES 2.x when available
Mathias Agopian [Wed, 14 Aug 2013 22:43:25 +0000 (22:43 +0000)]
Merge "don't reallocate the mesh each time we use it" into klp-dev
Mathias Agopian [Wed, 14 Aug 2013 22:42:51 +0000 (22:42 +0000)]
Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev
The Android Open Source Project [Wed, 14 Aug 2013 22:10:28 +0000 (15:10 -0700)]
Reconcile with klp-release - do not merge
Change-Id: I104b4a186af085b6a7a5f7d64f4dbb3dfd5aeb01
The Android Automerger [Wed, 14 Aug 2013 13:06:17 +0000 (06:06 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Wed, 14 Aug 2013 03:51:23 +0000 (20:51 -0700)]
don't reallocate the mesh each time we use it
the Mesh object can be part of each Layer (at least currently).
also reworked the Mesh code a bit to make it easier to access
the vertex data.
Change-Id: I0490851ba898f0aa2e55b62958dcd8bdb535e98b
Todd Poynor [Wed, 14 Aug 2013 00:26:40 +0000 (17:26 -0700)]
am
5025593d: Merge "dumpstate: switch to HAL static libraries" into klp-dev
* commit '
5025593d0ee6bf6d03121d9c42623bae0f131c9d':
dumpstate: switch to HAL static libraries
Todd Poynor [Wed, 14 Aug 2013 00:22:41 +0000 (00:22 +0000)]
Merge "dumpstate: switch to HAL static libraries" into klp-dev
Todd Poynor [Tue, 13 Aug 2013 23:30:01 +0000 (16:30 -0700)]
dumpstate: switch to HAL static libraries
Change-Id: I865a0b4b4a84a2d54a239e7b09874287f0c1ad56
Mathias Agopian [Thu, 8 Aug 2013 04:24:32 +0000 (21:24 -0700)]
SurfaceFlinger now uses GLES 2.x when available
Bug:
8679321
Change-Id: I2b152d01fb4e2de2ea9fe87f1ddbd6826d7520d7
Mathias Agopian [Tue, 13 Aug 2013 23:03:51 +0000 (16:03 -0700)]
am
5ff5a84e: allow "system" screenshots even when the secure flag is set
* commit '
5ff5a84e4829bad9eb44cc9a32d8579ca089051b':
allow "system" screenshots even when the secure flag is set
Mathias Agopian [Tue, 13 Aug 2013 22:55:43 +0000 (15:55 -0700)]
allow "system" screenshots even when the secure flag is set
we need too allow this case so that things like the rotation
animation can work.
with this change we only permit these screenshot if the
destination is SurfaceFlinger itself.
Bug:
10235036
Change-Id: I66fea5391e52b0d7f17f25827572b236f2d9eb71
Jesse Hall [Thu, 8 Aug 2013 20:40:22 +0000 (13:40 -0700)]
Add support for EGL_KHR_gl_colorspace
Change-Id: I684d0b8556cd6c84ee4b4d67e1bb95c3b96fccfb
Jesse Hall [Tue, 13 Aug 2013 19:06:31 +0000 (12:06 -0700)]
am
fc43e16a: Merge "Graphics:Add error check when create GraphicBuffer"
* commit '
fc43e16a5693bca0edfc82c650fb606971e47138':
Graphics:Add error check when create GraphicBuffer
Jesse Hall [Tue, 13 Aug 2013 19:02:56 +0000 (19:02 +0000)]
Merge "Graphics:Add error check when create GraphicBuffer"
Lingyun Zhu [Tue, 20 Nov 2012 11:24:35 +0000 (19:24 +0800)]
Graphics:Add error check when create GraphicBuffer
Change-Id: Ib0ca59bf1dfe4ae0266c29c91c1dbe3d02c0904e
Author: Lingyun Zhu <lingyun.zhu@intel.com>
Signed-off-by: Lingyun Zhu <lingyun.zhu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 50141
Jesse Hall [Tue, 13 Aug 2013 18:33:07 +0000 (18:33 +0000)]
Merge "Don't swallow eglCreateContext errors" into klp-dev
The Android Automerger [Tue, 13 Aug 2013 13:02:27 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Fri, 9 Aug 2013 01:16:21 +0000 (18:16 -0700)]
make sure GLConsumer::releaseTexImage() works after detachFromContext()
Change-Id: I27e0bc57e927d47b2b98113ee37b5396bcc72019
Jesse Hall [Mon, 12 Aug 2013 23:43:34 +0000 (16:43 -0700)]
Don't swallow eglCreateContext errors
If the implementation eglCreateContext failed, we called
eglGetError(), so we could check that it set the EGL error properly.
But since we'd already called this, when the app called eglGetError()
it would get EGL_SUCCESS!
Bug:
10181333
Change-Id: Ic45d3a8fcb8c4421e04844c6d2f52761790b5948
The Android Automerger [Mon, 12 Aug 2013 13:02:07 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Fri, 9 Aug 2013 04:41:19 +0000 (04:41 +0000)]
Merge "make sure we have a context when creating the 1st surface" into klp-dev
Mathias Agopian [Fri, 9 Aug 2013 00:46:48 +0000 (17:46 -0700)]
make GLConsumer's debug texture static
this is so that we don't burn a gralloc handle and a bit
of memory per GLConsumer.
Change-Id: I30c3e7ec45d7f1b5426aca8e06c7716870877706
Mathias Agopian [Thu, 8 Aug 2013 03:10:20 +0000 (20:10 -0700)]
make sure we have a context when creating the 1st surface
also add an option to dump the stack trace when
calling a GL function without a context.
Change-Id: I57b72bb8c322ac4253c3077bf150621bd9863b69
Jesse Hall [Thu, 8 Aug 2013 19:15:49 +0000 (12:15 -0700)]
Add ISurfaceComposer::destroyDisplay
Bug:
10191053
Change-Id: Ia89286f95421344a60ffedaaca5825c4e3cd7f9e
The Android Automerger [Thu, 8 Aug 2013 14:54:13 +0000 (07:54 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Wed, 7 Aug 2013 20:36:07 +0000 (20:36 +0000)]
Merge "don't hardcode debug texture dimensions"
Mathias Agopian [Wed, 7 Aug 2013 20:35:20 +0000 (13:35 -0700)]
don't hardcode debug texture dimensions
Change-Id: I356333801d246a8cafb3e977a77dc7325e8b822d
Jean-Baptiste Queru [Wed, 7 Aug 2013 20:18:51 +0000 (13:18 -0700)]
am
046b72fc: Merge "fix a possible deadlock when removing a layer and destroying a client"
* commit '
046b72fc5d93aae3b47b88b9f6683512d01d75d0':
fix a possible deadlock when removing a layer and destroying a client
Todd Poynor [Wed, 31 Jul 2013 02:12:10 +0000 (19:12 -0700)]
batteryservice: add battery current now and charge counter data
Change-Id: I4b3ea25342d4a03a8e38bfee2ef3b1ce54f82582
Jesse Hall [Wed, 7 Aug 2013 15:23:02 +0000 (15:23 +0000)]
Merge "Add EGL_KHR_get_all_proc_addresses to extension string"
Jesse Hall [Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)]
Merge "Set the swap interval of virtual display surfaces to 0"
The Android Automerger [Wed, 7 Aug 2013 13:00:54 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Jesse Hall [Wed, 7 Aug 2013 00:08:53 +0000 (17:08 -0700)]
Set the swap interval of virtual display surfaces to 0
This prevents slow/malicious virtual display consumers from
backpressuring SurfaceFlinger and preventing it from updating other
displays.
Bug:
10193714
Change-Id: I3e877d97202628d2d9abea24b66576f38299c14d
Mathias Agopian [Tue, 6 Aug 2013 23:47:04 +0000 (16:47 -0700)]
fix tests more
Change-Id: I05c3dd6a22440844f8bd071f4c2b620b2bd8c720
Mathias Agopian [Tue, 6 Aug 2013 23:42:05 +0000 (16:42 -0700)]
fix tests
Change-Id: I0f4d613481eda2c44a2d631a81d75de7e52e7a62
Mathias Agopian [Tue, 6 Aug 2013 23:07:33 +0000 (16:07 -0700)]
remove support for glReadPixels screenshot path
this was only needed on some chipset we're not
supporting in KLP.
Change-Id: I2e8fc07f135030bd61d2e241a8e426f1a4316425
Jesse Hall [Tue, 6 Aug 2013 22:31:22 +0000 (15:31 -0700)]
Add EGL_KHR_get_all_proc_addresses to extension string
We've had the extended behavior since Android 4.3, but the extension
hadn't been ratified by Khronos yet so we couldn't add it to the
extension string.
Bug:
9681677
Change-Id: I78842316a3ab7a3f66a0ac1a4742d837de664c4c
Mathias Agopian [Tue, 6 Aug 2013 22:19:15 +0000 (15:19 -0700)]
Fix build. 3rd attempt
Change-Id: I4317b34fd07890ea7cf9db51be42d72ef21aca89
Mathias Agopian [Fri, 2 Aug 2013 08:40:18 +0000 (01:40 -0700)]
All consumers now take an IGraphicBufferConsumer instead of a BufferQueue
this means they only have access to the consumer end of
the interface. we had a lot of code that assumed consumers
where holding a BufferQueue (i.e.: both ends), so most of
this change is untangling in fix that
Bug:
9265647
Change-Id: Ic2e2596ee14c7535f51bf26d9a897a0fc036d22c
Jean-Baptiste Queru [Tue, 6 Aug 2013 18:37:12 +0000 (18:37 +0000)]
Merge "fix a possible deadlock when removing a layer and destroying a client"
The Android Automerger [Tue, 6 Aug 2013 15:17:35 +0000 (08:17 -0700)]
merge in klp-release history after reset to master
Mathias Agopian [Wed, 5 Jun 2013 21:30:54 +0000 (14:30 -0700)]
fix a possible deadlock when removing a layer and destroying a client
generally the last reference to a Layer is released in commitTransaction()
with mStateLock held. Layer itself only holds weak references to Client,
however, ~Layer() briefly promotes this weak reference -- during that time
the all other strong references to that Client go away, ~Layer is left with
the last one... then hell breaks loose as ~Client is called, which in turn
needs to acquire mStateLock.
We fix this by holding a temporary copy of the drawing state during
the transaction so that the side-effects of copying the current
state into the drawing state are seen only after mStateLock has
been released.
Bug:
9106453
Change-Id: Ic5348ac12283500ead87286a37565e8da35f1db2
Eino-Ville Talvala [Mon, 5 Aug 2013 21:10:45 +0000 (21:10 +0000)]
Merge "BufferQueue: Support query of consumer usage bits"
The Android Automerger [Mon, 5 Aug 2013 13:01:34 +0000 (06:01 -0700)]
merge in klp-release history after reset to master
Andy McFadden [Fri, 2 Aug 2013 22:34:13 +0000 (22:34 +0000)]
Merge "Roll back recent change"
Andy McFadden [Fri, 2 Aug 2013 22:31:45 +0000 (15:31 -0700)]
Roll back recent change
Disable dropping of frames based on timestamp. Resume auto-
generating timestamps in Surface.
Bug
10151804
Change-Id: I15de26158e1d7ef22a5b150e685a126dc48ae2b4
Mathias Agopian [Fri, 2 Aug 2013 20:35:26 +0000 (20:35 +0000)]
Merge "Binderize the consumer side of BufferQueue"