summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* guest system gles fix: Enable screen capture with gpu onstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1bohu2015-01-291-6/+11
| | | | | | | | | | | | | | | | Currently, when running emulator with gpu on, screen capture does not work. This commit fixes that by doing the following steps: 1. enable gralloc to allocate buffer in gralloc_alloc for screen capture usage mode. 2. read back screen pixels in gralloc_lock for screen capture usage mode Note: This commit only fixes guest side, and to make screen capture work, we also need the corresponding fix on host side in the following CL: e36c098b5563adcc7442cb3a172ff769ee3fb4b6 (cherry picked from commit 5a50ac8819525f851c677be88a466b14737dbb18) Change-Id: Ie9307eda411ab3d0b3842fbb4a71926dd62a1875
* Fix a missed function override in GLEncoder.cppbohu2014-12-101-0/+1
| | | | | | | | glColorPointer override was missed and this commit fixes that. (cherry picked from commit 2e74d05cf71810cd25ac69d656c3bfa01aef7907) Change-Id: I8b303c5751aa38bd246903aeb418815f9ffd97f5
* Update goldfish from aosp/masterbohu2014-12-0237-3156/+2247
| | | | | | | | | | | | | | | | | | | | Merge aosp/master fixes into lmp-dev This patch updates the goldfish device to match the following patches: 1c9492dd Fix GPU emulation crash. 1da62b8c opengl: Fix a few function name typos. a4d0e1ca opengl: Remove accessor functions from encoders. 223a765d opengl: Remove compiler warnings. b7837c3c opengl: Regenerate GPU emulation encoder sources. 622970b4 opengl: Fix 64-bit build. 5fa17220 Unbind buffer when buffer is deleted 4a01a642 Properly initialize GLClientState's m_states 2c71ccd4 handles glGetBooleanv when value is nonboolean 4f9ec391 Fix eglDestroyContext and glTexImage2D 585a4b03 opengl: Fix pixelDataSize() ambiguity. Change-Id: I3f574149558b4b4cee8a3e354314f6da8f49957d
* Merge aosp/master fixes into lmp-devbohu2014-10-219-8/+129
| | | | | | | | | | | | | | | | | | | This patch updates the goldfish device to match the following patches: 3f62b50d Make the size of "cb_handle_t" same for 32/64-bit 7a2929cd Remove display initialization from eglGetProcAddress API d0fead3c ranchu: Add ARM64-specific root/ramdisk config files. 58ab34d9 Upgrade goldfish sensor HAL module to 1_0 e3e68659 ranchu: Fix goldfish_pipe definitions. fe2c5beb Use more appropriate type in cb_handle_t::validate. 40a674e0 Fix emulator crashes on glDrawElements command 972291ae Handle empty buffer in QemuPipeStream::writeFully 4aad46d9 Allow glGetProgramInfoLog_enc to have empty length 691e021d Guard against negative width and height f2f04f45 Guard against negative buffer size ebe80e44 Handle empty data parameter in glTexSubImage2D_enc Change-Id: Ib272952af902dc57fa6c76f966eb508a5fda838e
* Merge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-devVince Harron2014-09-191-1/+5
|\
| * Make the size of "cb_handle_t" same for 32/64-bitTina Zhang2014-09-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | cb_handle_t is usually created by Surfaceflinger which is a 64-bit process on 64-bit platform, and used by client processes which could be 32-bit processes or 64-bit processes. Since the "cb_handle_t" is like a protocol, we should make its size same for both 32-bit and 64-bit processes. Signed-off-by: Tina Zhang <tina.zhang@intel.com> (cherry picked from commit 3f62b50d45441ae077c958423e9e301acd5dcc11) Change-Id: I12aace9446e4566d9b12b0f50970ec00e8537dd9
* | Merge "Upgrade goldfish sensor HAL module to 1_0" into lmp-devVince Harron2014-09-191-11/+16
|\ \
| * | Upgrade goldfish sensor HAL module to 1_0bohu2014-09-181-11/+16
| |/ | | | | | | | | | | | | | | | | The previouls goldfish sensor HAL module is too outdated and is upgraded to 1_0 to make it work again. (cherry picked from commit 58ab34d952685a7b8a52151d2e39bd58ee4f6041) Change-Id: I9147b89bc5bea1beb4b9c6c3a6bbfd54668bc332
* / Remove display initialization from eglGetProcAddress APITina Zhang2014-09-181-9/+0
|/ | | | | | | | | | | | | | | | | We don't need to do the initialization in the eglGetProcAddress API. The work can be finished in the eglInitialize API. When zygote pre-loading resources, eglGetProcAddress will be called. If we let eglGetProcAddress do the display initialization, zygote will get the "qemu-pipe" handle of the "opengles" service. This is bad, because all the java processes which forked from zygote will get the same handle from zygote. Then the host service cannot distinguish from the device threads, and this will lead the emulator to crash. Signed-off-by: Tina Zhang <tina.zhang@intel.com> Signed-off-by: WeixingX Tian <weixingx.tian@intel.com> (cherry picked from commit 7a2929cd6548693b581c17ba69308a49e03c56be) Change-Id: I156970e004172e0bbe23a1a0c6c6b86850fd2ba6
* audio HAL: add parameters to open stream functionsEric Laurent2014-07-271-2/+5
| | | | | | | | Pass device address (and audio source for inputs) to open_output_stream() and open_input_stream() audio HAL functions. Bug: 14815883. Change-Id: I35932bd5c54d9da2e495d8edc54c044e7fc7c2a2
* Add audio_input_flags_t to HAL open_input_streamGlenn Kasten2014-07-161-1/+2
| | | | Change-Id: I14a437e0a93f26002c27aca17e11a771478ea84b
* Fix warningsGlenn Kasten2014-07-151-0/+1
| | | | Change-Id: I343bc4f81eb08b8cc29b02c94632f03b435abe0c
* am 3059c3dc: Revert "Revert "goldfish: Fix /cache partition type.""Xavier Ducrohet2014-06-211-2/+1
|\ | | | | | | | | * commit '3059c3dc3ba407878695ca60d5a08f8dcee6ef70': Revert "Revert "goldfish: Fix /cache partition type.""
| * Revert "Revert "goldfish: Fix /cache partition type.""Xavier Ducrohet2014-06-201-2/+1
| | | | | | | | | | | | This reverts commit c50716f710731c76a3fa5f31004bf0d7a8e300bd. Change-Id: I53586d24b0878d720d3984584dd492c6887ada07
* | am c50716f7: Revert "goldfish: Fix /cache partition type."Xavier Ducrohet2014-06-201-1/+2
|\| | | | | | | | | * commit 'c50716f710731c76a3fa5f31004bf0d7a8e300bd': Revert "goldfish: Fix /cache partition type."
| * Revert "goldfish: Fix /cache partition type."Xavier Ducrohet2014-06-201-1/+2
| | | | | | | | | | | | | | | | | | This is a temporary revert to get 32bit images running with the old emulator exe. This reverts commit f4c61a399ab2029e367743fa22d4a381f7524560. Change-Id: I507410d712cffc2d293788b8bedc97260d6e6b5b
* | am f4c61a39: goldfish: Fix /cache partition type.David 'Digit' Turner2014-06-180-0/+0
|\| | | | | | | | | * commit 'f4c61a399ab2029e367743fa22d4a381f7524560': goldfish: Fix /cache partition type.
| * goldfish: Fix /cache partition type.David 'Digit' Turner2014-06-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with kernel 3.10, yaffs2 partitions are no longer supported. This patch changes the type of the cache partition image to 'ext4' to allow booting a system based on such kernel, for example aosp_x86_64-userdebug. This works after the following patch was applied to the emulator: https://android-review.googlesource.com/#/c/98204/ Note that this works properly because the platform build system will extract the value to know how to generate cache.img at build time properly. See $AOSP/build/tools/releasetools/img_from_target_files BUG=15144004 Change-Id: I6c123c9baf84d13507a44b8205ec79746fb2628f
* | am 765b8b4b: am 7ea757df: Merge "goldfish: camera: fix 64-bit warnings"Colin Cross2014-06-188-39/+45
|\ \ | | | | | | | | | | | | * commit '765b8b4bf218560acc79f665d5c6c56e0351469a': goldfish: camera: fix 64-bit warnings
| * \ am 7ea757df: Merge "goldfish: camera: fix 64-bit warnings"Colin Cross2014-06-188-39/+45
| |\ \ | | | | | | | | | | | | | | | | * commit '7ea757df0311bfb7310a7a765dcec1b79f39f25d': goldfish: camera: fix 64-bit warnings
| | * \ Merge "goldfish: camera: fix 64-bit warnings"Colin Cross2014-06-178-39/+45
| | |\ \
| | | * | goldfish: camera: fix 64-bit warningsColin Cross2014-06-188-39/+45
| | |/ / | | | | | | | | | | | | Change-Id: If15f27505e3849406769b7f03cb77ea8dec86e70
* | | | am f448dd4f: am eed789f0: Merge "goldfish: Fix /cache partition type."David 'Digit' Turner2014-06-171-2/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'f448dd4f3eb901934c7c06de9ba30004c21525e0': goldfish: Fix /cache partition type.
| * | | am eed789f0: Merge "goldfish: Fix /cache partition type."David 'Digit' Turner2014-06-171-2/+1
| |\| | | | | | | | | | | | | | | | | | * commit 'eed789f036cbcedf2fa96ae3e273c2234102d340': goldfish: Fix /cache partition type.
| | * | Merge "goldfish: Fix /cache partition type."David 'Digit' Turner2014-06-171-2/+1
| | |\ \
| | | * | goldfish: Fix /cache partition type.David 'Digit' Turner2014-06-181-2/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with kernel 3.10, yaffs2 partitions are no longer supported. This patch changes the type of the cache partition image to 'ext4' to allow booting a system based on such kernel, for example aosp_x86_64-userdebug. This works after the following patch was applied to the emulator: https://android-review.googlesource.com/#/c/98204/ Note that this works properly because the platform build system will extract the value to know how to generate cache.img at build time properly. See $AOSP/build/tools/releasetools/img_from_target_files BUG=15144004 Change-Id: I6c123c9baf84d13507a44b8205ec79746fb2628f
* | | | am fe6007cf: am 690792a6: Merge "Revert "Revert "goldfish: cache image is ↵Greg Hackmann2014-06-111-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | not ext4. yet.""" * commit 'fe6007cf2ca61a69eac45d11c7fb52af7ed5b841': Revert "Revert "goldfish: cache image is not ext4. yet.""
| * | | am 690792a6: Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""Greg Hackmann2014-06-111-1/+2
| |\| | | | | | | | | | | | | | | | | | * commit '690792a66c7fca6bf0aa17c2d5043ab86d145965': Revert "Revert "goldfish: cache image is not ext4. yet.""
| | * | Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""Greg Hackmann2014-06-101-1/+2
| | |\ \
| | | * | Revert "Revert "goldfish: cache image is not ext4. yet.""Greg Hackmann2014-06-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e2caf7883279113d6f5f4777122dc88262c34c6. Change-Id: I4d9dcd07e2abfbcb81b4e62b17e6450023fdaa0e
* | | | | am 3b0bfe13: am d8a6e670: Merge "Revert "goldfish: cache image is not ext4. ↵Greg Hackmann2014-06-111-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yet."" * commit '3b0bfe135d9ce7fae0de32432583ee8cd27d1184': Revert "goldfish: cache image is not ext4. yet."
| * | | | am d8a6e670: Merge "Revert "goldfish: cache image is not ext4. yet.""Greg Hackmann2014-06-111-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd8a6e67044ddcac7c53adbe6b871c33447110905': Revert "goldfish: cache image is not ext4. yet."
| | * | | Merge "Revert "goldfish: cache image is not ext4. yet.""Greg Hackmann2014-06-101-2/+1
| | |\| |
| | | * | Revert "goldfish: cache image is not ext4. yet."Greg Hackmann2014-06-101-2/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a2543be45f35ab7ace3ecd92c99a3c72150622ec. Bug: 13115061 Change-Id: Id4320af03bfcbcacbb37f4cf63261db31f126a1e Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am cdd78a38: am aec15d91: am 646f0b25: Merge "opengl: rcOpenColorBuffer must ↵Jesse Hall2014-05-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | be synchronous" * commit 'cdd78a386dff8438a66d40abb4fa9c639c57b89c': opengl: rcOpenColorBuffer must be synchronous
| * | | am aec15d91: am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"Jesse Hall2014-05-280-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'aec15d91ee48797f2b3c3fe61cca977900ebcd47': opengl: rcOpenColorBuffer must be synchronous
| | * | am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"Jesse Hall2014-05-289-2/+36
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '646f0b25e63164950d1d99b9b8021be74c2321c6': opengl: rcOpenColorBuffer must be synchronous
| | | * \ Merge "opengl: rcOpenColorBuffer must be synchronous"Jesse Hall2014-05-289-2/+36
| | | |\ \
| | | | * | opengl: rcOpenColorBuffer must be synchronousJesse Hall2014-05-279-2/+36
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gralloc register_buffer() function, which calls rcOpenColorBuffer, must actually increment the reference count before returning. Otherwise the buffer allocator may release its reference before the client has obtained one, and the buffer will be freed prematurely. Since rcOpenColorBuffer was just sending a message to the host without waiting for it to be received/processed, this guarantee was not met. Adding a return value makes the call synchronous. Bug: 12988668 Change-Id: I8b2399cfb0f600f99b3387f630343291b59bc9a6
* | | | | am dc684041: am c04a27cb: opengl: rcOpenColorBuffer must be synchronousJesse Hall2014-05-289-2/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc684041d9fbfd3b7db6fb0294286764d92564d0': opengl: rcOpenColorBuffer must be synchronous
| * | | | am c04a27cb: opengl: rcOpenColorBuffer must be synchronousJesse Hall2014-05-289-2/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c04a27cb9a25ba26893212914fd725a85f8d6694': opengl: rcOpenColorBuffer must be synchronous
| | * | | | opengl: rcOpenColorBuffer must be synchronousJesse Hall2014-05-279-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gralloc register_buffer() function, which calls rcOpenColorBuffer, must actually increment the reference count before returning. Otherwise the buffer allocator may release its reference before the client has obtained one, and the buffer will be freed prematurely. Since rcOpenColorBuffer was just sending a message to the host without waiting for it to be received/processed, this guarantee was not met. Adding a return value makes the call synchronous. Bug: 12988668 Change-Id: I8b2399cfb0f600f99b3387f630343291b59bc9a6
* | | | | | am 900db52a: am 6ccaeebd: am 2c6c08a2: Merge "Move goldfish from fdprintf to ↵Calin Juravle2014-05-221-35/+35
|\| | | | | | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | POSIX dprintf." * commit '900db52a603397783f41ddfae2e819fbe31ba505': Move goldfish from fdprintf to POSIX dprintf.
| * | | | am 6ccaeebd: am 2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-35/+35
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7': Move goldfish from fdprintf to POSIX dprintf.
| | * | | am 2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-35/+35
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '2c6c08a23d2f5f760753745be5b67fe5759dcc91': Move goldfish from fdprintf to POSIX dprintf.
| | | * | Merge "Move goldfish from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-35/+35
| | | |\ \
| | | | * | Move goldfish from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-35/+35
| | | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: Ice06dcd5e1a1b6c682a5c5f4dbec5ac6a4837f84
* | | | | opengl: Fix const-ness of GLES prototypes to match new headersJesse Hall2014-05-216-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 1502849 Change-Id: I902517c23354e14f9c63b1584db286d682315bb5
* | | | | am 0e00cd05: am dbda557d: am 5cb5779a: Merge "gralloc: don\'t initialize ↵Greg Hackmann2014-05-122-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reserved_proc" * commit '0e00cd058fe59b90068fa0888000fec5a99dae30': gralloc: don't initialize reserved_proc
| * | | | am dbda557d: am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"Greg Hackmann2014-05-122-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'dbda557d4dcf022850ea4ab4f89e1c154e2aea04': gralloc: don't initialize reserved_proc
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-29 13:17:36 +0000