Jesse Hall
f3fa071228
am 93573e91
: Merge "Treat composition frames with no layers as using GLES composition" into klp-dev
...
* commit '93573e91c22ba8329222c69cd7f099f5703fb444':
Treat composition frames with no layers as using GLES composition
2013-10-02 09:37:50 -07:00
Jesse Hall
72d270c5f0
am b716e570
: Set the outbuf acquire fence after we actually have it.
...
* commit 'b716e57048e945d5bceda33c2434c65d06464dba':
Set the outbuf acquire fence after we actually have it.
2013-10-02 09:37:49 -07:00
Jesse Hall
93573e91c2
Merge "Treat composition frames with no layers as using GLES composition" into klp-dev
2013-10-02 14:54:03 +00:00
Jesse Hall
b716e57048
Set the outbuf acquire fence after we actually have it.
...
In GLES-only mode, we don't have the outbuf acquire fence until after
GLES composition is done for the frame. We were setting the fence in
HWC's state immediately after dequeueing the buffer from the consumer,
before GLES had started. This fence got passed through HWC and on to
the consumer, so the consumer was reading the buffer before GLES was
done writing to it.
Now we update HWC's state just before set(), when we know we have the
right fence.
Bug: 11000763
Change-Id: Iea9db4c69634c352dc2d600f0bdb6bef2a432636
2013-10-01 17:25:20 -07:00
Mathias Agopian
ac68302e1c
only clear FB when asked for the opaque layer
...
a layer need to be considered NOT opaque if it has a
plane-alpha.
Bug: 10846930
Change-Id: Ibd8981b63ede4560c7096bacc4cff46a7eb2a8bb
2013-10-01 15:36:52 -07:00
Jesse Hall
92d7c3ee03
am b65f32eb
: Fix two EGLConfig selection bugs
...
* commit 'b65f32ebe2c86869b07ac1c986660dfb2187b7d3':
Fix two EGLConfig selection bugs
2013-09-30 21:38:40 -07:00
Jesse Hall
d05a17fbb3
Treat composition frames with no layers as using GLES composition
...
When there are no window layers for a display, SurfaceFlinger clears
the undefined region using GLES. Some of the places that check for
GLES composition weren't considering this special case, in particular:
- We were skipping the eglSwapBuffers() on these frames.
- We were putting VirtualDisplaySurface in HWC-only composition mode.
This change centralizes the logic for this special case.
Bug: 10957068
Change-Id: I2deaf2ed101e8ea76708862a6bb67751b6078794
2013-09-30 17:08:28 -07:00
Jesse Hall
6f2bc240e9
Fix two EGLConfig selection bugs
...
This fixes two bugs introduced by
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
(a) There is no invalid EGLConfig value, in particular zero is valid.
Checking return values of eglGetConfigs and eglChooseConfig is the
only way to determine success.
(b) The "simple" EGLConfig query used as the emulator fallback should
not include EGL_RECORDABLE; the emulator doesn't have it.
Bug: 10935622
Change-Id: Ib798a24e7cf06a679811c46eaa45d39174a715ec
2013-09-30 16:37:06 -07:00
Jesse Hall
b65f32ebe2
Fix two EGLConfig selection bugs
...
This fixes two bugs introduced by
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
(a) There is no invalid EGLConfig value, in particular zero is valid.
Checking return values of eglGetConfigs and eglChooseConfig is the
only way to determine success.
(b) The "simple" EGLConfig query used as the emulator fallback should
not include EGL_RECORDABLE; the emulator doesn't have it.
Bug: 10935622
Change-Id: Ib798a24e7cf06a679811c46eaa45d39174a715ec
2013-09-30 10:49:16 -07:00
The Android Automerger
08db4d4ef7
merge in klp-release history after reset to klp-dev
2013-09-29 06:01:19 -07:00
Elliott Hughes
b7f3742feb
am d9be16f9
: Merge "Fix OpenGL stub exception handling."
...
* commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c':
Fix OpenGL stub exception handling.
2013-09-27 15:38:04 -07:00
Elliott Hughes
d9be16f920
Merge "Fix OpenGL stub exception handling."
2013-09-27 22:31:19 +00:00
Mathias Agopian
8499e93f4d
fix crashers with wifi/virtual displays
...
Bug: 10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
2013-09-27 11:30:59 -07:00
Mathias Agopian
338acd6869
am 86206b41
: Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
...
* commit '86206b41b2ff000e086301c6bafb8da577e563b2':
fix initialization of framebuffer target crop rect on hwc 1.3
2013-09-26 12:44:27 -07:00
Mathias Agopian
0ff4b28396
am 6da15f46
: fix crashers with wifi/virtual displays
...
* commit '6da15f46f5f8b38e31384d641f8d3db2c3c6ea30':
fix crashers with wifi/virtual displays
2013-09-26 12:44:27 -07:00
Mathias Agopian
86206b41b2
Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into klp-dev
2013-09-26 19:41:22 +00:00
Mathias Agopian
8f63c2049b
fix initialization of framebuffer target crop rect on hwc 1.3
...
Bug: 10936771
Change-Id: If283e5e231ca34b93e0b1784bb4e8e4c7bfd75de
2013-09-25 20:44:34 -07:00
Mathias Agopian
6da15f46f5
fix crashers with wifi/virtual displays
...
Bug: 10647742
Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
2013-09-25 20:40:07 -07:00
Elliott Hughes
2adde7c837
Fix OpenGL stub exception handling.
...
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2bdc22c5fe75f5e41ffb9dd9259ae92cf8a12917
2013-09-24 17:18:05 -07:00
The Android Automerger
dbf6e66206
merge in klp-release history after reset to klp-dev
2013-09-22 10:51:13 -07:00
Nick Kralevich
e4e91c4ead
resolved conflicts for merge of e678897f
to klp-dev-plus-aosp
...
Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70
2013-09-20 12:45:20 -07:00
Nick Kralevich
e678897f3a
Merge "Proper security labeling of multi-user data directories."
2013-09-20 19:35:36 +00:00
Eino-Ville Talvala
a7395b4078
GLConsumer: Add query for current frame number.
...
Surface the underlying frame number of the current texture.
Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
2013-09-20 03:37:01 -07:00
Mathias Agopian
754bad4534
am d555684c
: reinstate black-screenshot debugging code
...
* commit 'd555684cb36dfb959694db76962e570184f98838':
reinstate black-screenshot debugging code
2013-09-19 17:13:52 -07:00
Mathias Agopian
d555684cb3
reinstate black-screenshot debugging code
...
turned off by default.
Bug: 10809349
Change-Id: I3e6b8c7860e6b0e122b8f07de4020967cd1f005c
2013-09-19 17:09:26 -07:00
Mathias Agopian
f589dd2915
am e2a3e872
: Merge "Fix GLES context version selection" into klp-dev
...
* commit 'e2a3e8727408937bb7107c206444fa49a150f358':
Fix GLES context version selection
2013-09-19 15:34:15 -07:00
Mathias Agopian
e2a3e87274
Merge "Fix GLES context version selection" into klp-dev
2013-09-19 22:29:30 +00:00
Eino-Ville Talvala
1160e89d31
am d171da97
: GLConsumer: Add query for current frame number.
...
* commit 'd171da973de3c6b30263011334fdcd916739144f':
GLConsumer: Add query for current frame number.
2013-09-19 14:59:51 -07:00
Eino-Ville Talvala
d171da973d
GLConsumer: Add query for current frame number.
...
Surface the underlying frame number of the current texture.
Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
2013-09-19 13:36:07 -07:00
The Android Automerger
7fa91dc3a7
merge in klp-release history after reset to klp-dev
2013-09-19 06:01:50 -07:00
Mathias Agopian
2185f8b420
Fix GLES context version selection
...
Explicitly selects an ES 2.0 config first, then an ES 1.x config,
before attempting the fallback path for the emulator.
Bug: 10820214
Change-Id: Ia8cc084c02a0e3de910def024da8a08d02bbd89d
2013-09-18 16:20:26 -07:00
Mathias Agopian
a7e1660b25
am c1c05de4
: fix camera API 2.0 orientation
...
* commit 'c1c05de415854eb7a13a16b7e22a22de8515123a':
fix camera API 2.0 orientation
2013-09-18 15:33:38 -07:00
Robert Craig
880d1a957e
Proper security labeling of multi-user data directories.
...
Add seinfo paramater to appropriate make directory
functions. This allows proper labeling for multi-user
scenarios.
Change-Id: Iaba7c40645bc7b6cc823d613da0c3782acf6ddd5
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-09-18 13:21:12 +00:00
Mathias Agopian
c1c05de415
fix camera API 2.0 orientation
...
we add a flag to ANativeWindow::setBufferTransform that means
"apply the inverse rotation of the display this buffer is displayed
onto to".
Bug: 10804238
Change-Id: Id2447676271950463e8dbcef1b95935c5c3f32b2
2013-09-17 23:45:22 -07:00
The Android Automerger
3134a0bb18
merge in klp-release history after reset to klp-dev
2013-09-17 21:11:23 -07:00
The Android Automerger
2f1bd0a9e2
merge in klp-release history after reset to klp-dev
2013-09-17 17:39:56 -07:00
Mathias Agopian
e803e6095e
am 799f5126
: Fix build (tests)
...
* commit '799f51268006f319f6ae538dca670bfc7f522688':
Fix build (tests)
2013-09-17 15:58:55 -07:00
Mathias Agopian
799f512680
Fix build (tests)
...
Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6
2013-09-17 15:55:18 -07:00
Mathias Agopian
3f342c1133
am 02b62df7
: Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
...
* commit '02b62df7119b27c89d91d96938d8f4f5232b296b':
Make sure do disconnect from a BQ when its client dies.
2013-09-17 14:33:09 -07:00
Mathias Agopian
02b62df711
Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
2013-09-17 21:31:14 +00:00
Aravind Akella
30480ac9f9
am fca43392
: Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
...
* commit 'fca43392b755b34c83c3abbfea216bafa9cd8171':
Fix for AOSP fusion sensors not handling multiple clients correctly.
2013-09-17 11:22:59 -07:00
Aravind Akella
fca43392b7
Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." into klp-dev
2013-09-17 18:17:50 +00:00
Aravind Akella
47e300c4b4
am f0c72846
: Merge "Sensor Batching Bug fixes." into klp-dev
...
* commit 'f0c728465a87435e6a8a66991451cf6fe72acc24':
Sensor Batching Bug fixes.
2013-09-17 10:51:53 -07:00
Aravind Akella
f0c728465a
Merge "Sensor Batching Bug fixes." into klp-dev
2013-09-17 17:49:27 +00:00
Amith Yamasani
3e08bb7668
am fc7083a8
: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
...
* commit 'fc7083a828b6db00698c1418e5f370b31625213c':
Enable FEATURE_DEVICE_ADMIN for handheld devices
2013-09-17 08:58:55 -07:00
Amith Yamasani
fc7083a828
Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-dev
2013-09-17 15:56:24 +00:00
The Android Automerger
92d16bd3ee
merge in klp-release history after reset to klp-dev
2013-09-17 06:01:01 -07:00
Jesse Hall
b8080d9a3b
am 2a36497e
: Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
...
* commit '2a36497e45d4d96e35fed89cfdcb09b71459ac3c':
Stop using default value for Surface producerControlledByApp parameter
2013-09-16 20:30:11 -07:00
Jesse Hall
2a36497e45
Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
2013-09-17 03:27:15 +00:00
Mathias Agopian
365857df8b
Make sure do disconnect from a BQ when its client dies.
...
Bug: 5679534
Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53
2013-09-16 16:15:21 -07:00