summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f0cf5f10: BufferQueue: fix a test crashJamie Gennis2013-10-021-5/+9
|\ | | | | | | | | * commit 'f0cf5f103cf9c54d59de4ed6f1d8ddd2302dec1b': BufferQueue: fix a test crash
| * BufferQueue: fix a test crashJamie Gennis2013-10-021-5/+9
| | | | | | | | | | Bug: 10935880 Change-Id: If76e9fb055103bad0db7e6c16487532671573149
* | am a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-devJamie Gennis2013-10-025-67/+144
|\ \ | |/ | | | | | | * commit 'a9c47f327373cbe48e187442c7f9554d24a75c08': GLConsumer: start using EGL_ANDROID_image_crop
| * Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-devJamie Gennis2013-10-025-67/+144
| |\
| | * GLConsumer: start using EGL_ANDROID_image_cropJamie Gennis2013-10-025-67/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes GLConsumer use the EGL_ANDROID_image_crop extension when available on a device. The crop rectangle is passed to the EGL driver when creating EGLImages, allowing the crop to be performed by the driver rather than using the texture transform matrix. Bug: 10897141 Change-Id: I63e9a5d5c85067376abc420e3639154468346311
* | | am 06993503: Merge "only clear FB when asked for the opaque layer" into klp-devDave Burke2013-10-021-1/+2
|\ \ \ | |/ / | | | | | | | | | * commit '0699350336cccc244bb6c52a0d910f9599253812': only clear FB when asked for the opaque layer
| * | Merge "only clear FB when asked for the opaque layer" into klp-devDave Burke2013-10-021-1/+2
| |\ \ | | |/ | |/|
| | * only clear FB when asked for the opaque layerMathias Agopian2013-10-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | a layer need to be considered NOT opaque if it has a plane-alpha. Bug: 10846930 Change-Id: Ibd8981b63ede4560c7096bacc4cff46a7eb2a8bb
* | | am 93573e91: Merge "Treat composition frames with no layers as using GLES ↵Jesse Hall2013-10-022-1/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | composition" into klp-dev * commit '93573e91c22ba8329222c69cd7f099f5703fb444': Treat composition frames with no layers as using GLES composition
| * | Merge "Treat composition frames with no layers as using GLES composition" ↵Jesse Hall2013-10-022-1/+10
| |\ \ | | | | | | | | | | | | into klp-dev
| | * | Treat composition frames with no layers as using GLES compositionJesse Hall2013-09-302-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am b716e570: Set the outbuf acquire fence after we actually have it.Jesse Hall2013-10-021-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b716e57048e945d5bceda33c2434c65d06464dba': Set the outbuf acquire fence after we actually have it.
| * | | Set the outbuf acquire fence after we actually have it.Jesse Hall2013-10-011-1/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am b65f32eb: Fix two EGLConfig selection bugsJesse Hall2013-09-302-23/+20
|\ \ \ | |/ / | | | | | | | | | * commit 'b65f32ebe2c86869b07ac1c986660dfb2187b7d3': Fix two EGLConfig selection bugs
| * | Fix two EGLConfig selection bugsJesse Hall2013-09-302-23/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am d9be16f9: Merge "Fix OpenGL stub exception handling."Elliott Hughes2013-09-271-0/+1
|\ \ | | | | | | | | | | | | * commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c': Fix OpenGL stub exception handling.
| * \ Merge "Fix OpenGL stub exception handling."Elliott Hughes2013-09-271-0/+1
| |\ \
| | * | Fix OpenGL stub exception handling.Elliott Hughes2013-09-241-0/+1
| |/ / | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=60390 Change-Id: I2bdc22c5fe75f5e41ffb9dd9259ae92cf8a12917
* | | am 86206b41: Merge "fix initialization of framebuffer target crop rect on ↵Mathias Agopian2013-09-261-1/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | hwc 1.3" into klp-dev * commit '86206b41b2ff000e086301c6bafb8da577e563b2': fix initialization of framebuffer target crop rect on hwc 1.3
| * | Merge "fix initialization of framebuffer target crop rect on hwc 1.3" into ↵Mathias Agopian2013-09-261-1/+8
| |\ \ | | | | | | | | | | | | klp-dev
| | * | fix initialization of framebuffer target crop rect on hwc 1.3Mathias Agopian2013-09-251-1/+8
| | | | | | | | | | | | | | | | | | | | Bug: 10936771 Change-Id: If283e5e231ca34b93e0b1784bb4e8e4c7bfd75de
* | | | am 6da15f46: fix crashers with wifi/virtual displaysMathias Agopian2013-09-262-0/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6da15f46f5f8b38e31384d641f8d3db2c3c6ea30': fix crashers with wifi/virtual displays
| * | | fix crashers with wifi/virtual displaysMathias Agopian2013-09-252-0/+17
| |/ / | | | | | | | | | | | | Bug: 10647742 Change-Id: I4b8ed9da52ef95af3a3b3a04b98514a3776a674d
* | | resolved conflicts for merge of e678897f to klp-dev-plus-aospNick Kralevich2013-09-203-5/+6
|\ \ \ | | |/ | |/| | | | Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70
| * | Merge "Proper security labeling of multi-user data directories."Nick Kralevich2013-09-203-5/+6
| |\ \
| | * | Proper security labeling of multi-user data directories.Robert Craig2013-09-183-5/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | am d555684c: reinstate black-screenshot debugging codeMathias Agopian2013-09-194-9/+20
|\ \ \ | | |/ | |/| | | | | | | * commit 'd555684cb36dfb959694db76962e570184f98838': reinstate black-screenshot debugging code
| * | reinstate black-screenshot debugging codeMathias Agopian2013-09-194-9/+20
| | | | | | | | | | | | | | | | | | | | | turned off by default. Bug: 10809349 Change-Id: I3e6b8c7860e6b0e122b8f07de4020967cd1f005c
* | | am e2a3e872: Merge "Fix GLES context version selection" into klp-devMathias Agopian2013-09-193-36/+61
|\ \ \ | |/ / | | | | | | | | | * commit 'e2a3e8727408937bb7107c206444fa49a150f358': Fix GLES context version selection
| * | Merge "Fix GLES context version selection" into klp-devMathias Agopian2013-09-193-36/+61
| |\ \
| | * | Fix GLES context version selectionMathias Agopian2013-09-183-36/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am d171da97: GLConsumer: Add query for current frame number.Eino-Ville Talvala2013-09-192-0/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd171da973de3c6b30263011334fdcd916739144f': GLConsumer: Add query for current frame number.
| * | | GLConsumer: Add query for current frame number.Eino-Ville Talvala2013-09-192-0/+19
| |/ / | | | | | | | | | | | | | | | | | | Surface the underlying frame number of the current texture. Bug: 10830400 Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
* | | am c1c05de4: fix camera API 2.0 orientationMathias Agopian2013-09-189-6/+100
|\ \ \ | |/ / | | | | | | | | | * commit 'c1c05de415854eb7a13a16b7e22a22de8515123a': fix camera API 2.0 orientation
| * | fix camera API 2.0 orientationMathias Agopian2013-09-179-6/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 799f5126: Fix build (tests)Mathias Agopian2013-09-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '799f51268006f319f6ae538dca670bfc7f522688': Fix build (tests)
| * | Fix build (tests)Mathias Agopian2013-09-171-1/+1
| | | | | | | | | | | | Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6
* | | am 02b62df7: Merge "Make sure do disconnect from a BQ when its client dies." ↵Mathias Agopian2013-09-177-14/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | into klp-dev * commit '02b62df7119b27c89d91d96938d8f4f5232b296b': Make sure do disconnect from a BQ when its client dies.
| * | Merge "Make sure do disconnect from a BQ when its client dies." into klp-devMathias Agopian2013-09-177-14/+63
| |\ \
| | * | Make sure do disconnect from a BQ when its client dies.Mathias Agopian2013-09-167-14/+63
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5679534 Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53
* | | | am fca43392: Merge "Fix for AOSP fusion sensors not handling multiple ↵Aravind Akella2013-09-176-15/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | clients correctly." into klp-dev * commit 'fca43392b755b34c83c3abbfea216bafa9cd8171': Fix for AOSP fusion sensors not handling multiple clients correctly.
| * | | Merge "Fix for AOSP fusion sensors not handling multiple clients correctly." ↵Aravind Akella2013-09-176-15/+15
| |\ \ \ | | | | | | | | | | | | | | | into klp-dev
| | * | | Fix for AOSP fusion sensors not handling multiple clients correctly.Aravind Akella2013-09-166-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10786801 Change-Id: I7b938bc583a303a30237c3d93b5accbf64cc90b5
* | | | | am f0c72846: Merge "Sensor Batching Bug fixes." into klp-devAravind Akella2013-09-172-14/+173
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f0c728465a87435e6a8a66991451cf6fe72acc24': Sensor Batching Bug fixes.
| * | | | Merge "Sensor Batching Bug fixes." into klp-devAravind Akella2013-09-172-14/+173
| |\ \ \ \
| | * | | | Sensor Batching Bug fixes.Aravind Akella2013-09-162-14/+173
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) SensorService dropping events. Increase SOCKET_BUFFER_SIZE in BitTube ctor. ii) Call flush before every activate. iii) Emulate flush for older devices. Add a trivial flush complete event when flush is called. Bug: 10641596 Change-Id: I30d0f3948e830457143f16e157b6ad81908687ce
* | | | | am fc7083a8: Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into ↵Amith Yamasani2013-09-172-0/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'fc7083a828b6db00698c1418e5f370b31625213c': Enable FEATURE_DEVICE_ADMIN for handheld devices
| * | | | Merge "Enable FEATURE_DEVICE_ADMIN for handheld devices" into klp-devAmith Yamasani2013-09-172-0/+4
| |\ \ \ \
| | * | | | Enable FEATURE_DEVICE_ADMIN for handheld devicesAmith Yamasani2013-09-162-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 9520957 Change-Id: I9c09dc726509db9e6d9ba4700255c74528b9f9fa
* | | | | am 2a36497e: Merge "Stop using default value for Surface ↵Jesse Hall2013-09-163-7/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | producerControlledByApp parameter" into klp-dev * commit '2a36497e45d4d96e35fed89cfdcb09b71459ac3c': Stop using default value for Surface producerControlledByApp parameter