OSDN Git Service
Yu Ning [Fri, 7 Aug 2015 18:26:48 +0000 (18:26 +0000)]
am
e40e60a6: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
* commit '
e40e60a6ad91ac2c42837d1a9cb84037cc2a6e5f':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
Yu Ning [Thu, 16 Jul 2015 06:54:04 +0000 (14:54 +0800)]
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
When GPU emulation is enabled, the emulator sometimes freezes, with an
error message in logcat similar to the following:
QemuPipeStream::readFully failed (buf 0x7f9cd8ab8000): Bad address
Some users have reported the same issue, e.g.:
https://code.google.com/p/android/issues/detail?id=170633
The root cause is that QemuPipeStream::readFully(void *buf, size_t len)
may attempt to read beyond (buf + len), resulting in a -EFAULT return
value from the goldfish/qemu pipe driver.
Fix this bug to improve the stability of the emulator. In addition,
- Add more information to the said error message to facilitate future
debugging.
- Use "%zu" instead of "%d" for logging size_t variables.
Change-Id: I8785fee0427fd6c0f25237470b346e769a82c992
Signed-off-by: Yu Ning <yu.ning@intel.com>
Signed-off-by: Pengcheng Chen <pengcheng.chen@intel.com>
David Turner [Fri, 27 Mar 2015 16:35:14 +0000 (16:35 +0000)]
am
2b763c9f: Merge "Checking parameters for glCreateShader in guest"
* commit '
2b763c9fec35bcab3689785ad808a4317772acae':
Checking parameters for glCreateShader in guest
Tina Zhang [Thu, 26 Mar 2015 06:45:29 +0000 (14:45 +0800)]
Checking parameters for glCreateShader in guest
Currently, the guest part doesn't do enough to check each API's
parameters. This may lead to conformance issues. Considering
performance and conformance on multiple platform, it's better
to add the parameter validation in guest part.
Change-Id: Ic37c9bae5fba3c7e75a2095416fea41b8d1a949a
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
bohu [Wed, 18 Feb 2015 00:41:53 +0000 (00:41 +0000)]
am
254093f7: am
35169dbb: am
dfbcadfc: am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
254093f7271d879c252aedc46511668c5239f2fa':
back port gles fix to api 18
bohu [Wed, 18 Feb 2015 00:41:53 +0000 (00:41 +0000)]
am
3bf12050: am
7f721057: (-s ours) resolved conflicts for merge of
52667f55 to klp-modular-dev
* commit '
3bf1205021bd384aac498b9c7d1ee166652e6944':
Port back gles bug fixes and rotation fix
bohu [Tue, 17 Feb 2015 18:40:00 +0000 (18:40 +0000)]
am
35169dbb: am
dfbcadfc: am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
35169dbba182b1e10ea8e12b512a4875d97412e9':
back port gles fix to api 18
bohu [Tue, 17 Feb 2015 18:34:41 +0000 (18:34 +0000)]
am
dfbcadfc: am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
dfbcadfc750113cb01a767b67414a1c2041301a6':
back port gles fix to api 18
bohu [Tue, 17 Feb 2015 17:21:15 +0000 (17:21 +0000)]
am
7f721057: (-s ours) resolved conflicts for merge of
52667f55 to klp-modular-dev
* commit '
7f721057aeed0d18ddf96a1b9a4bc9994384d06a':
Port back gles bug fixes and rotation fix
bohu [Fri, 13 Feb 2015 21:35:28 +0000 (13:35 -0800)]
resolved conflicts for merge of
52667f55 to klp-modular-dev
Change-Id: Id6ac649d4a960f1ff176660e80cb5e611c9a03e0
bohu [Fri, 13 Feb 2015 21:22:39 +0000 (21:22 +0000)]
am
6e3ed47a: (-s ours) am
aa028a3c: back port gles fix to api 18
* commit '
6e3ed47ab0b06e09d4b8531e05805c4b3ea0e924':
back port gles fix to api 18
bohu [Fri, 13 Feb 2015 20:55:12 +0000 (20:55 +0000)]
am
aa028a3c: back port gles fix to api 18
* commit '
aa028a3c593319d085b43f3fcc78b571524d6de2':
back port gles fix to api 18
bohu [Tue, 3 Feb 2015 23:26:33 +0000 (15:26 -0800)]
back port gles fix to api 18
Following CLs are backported:
5a50ac8819525f851c677be88a466b14737dbb18 guest system gles fix: Enable screen capture with gpu on
717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
7fa2b92de2058a3556e5f38a135de415bb3d5e45 Merge "Use more appropriate type in cb_handle_t::validate."
fe2c5beb964d2e2aecedb02b9cca592e0811d90b Use more appropriate type in cb_handle_t::validate.
376688e76694bf5b8672379c540b1bda059da682 Merge "ranchu: Fix goldfish_pipe definitions."
e3e686593cc8bdaf3ca4f6fa0b33b62a6951d1d6 ranchu: Fix goldfish_pipe definitions.
7d3d0c99d2c82319e001289d1b9e091e5ff8f7aa Merge "ranchu: Add ARM64-specific root/ramdisk config files."
d0fead3c53d6e450deb69aad72651e132b6cc072 ranchu: Add ARM64-specific root/ramdisk config files.
638ee524f83053613c47ddea22c4bf98a0175c2f Merge "Remove display initialization from eglGetProcAddress API"
7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 Merge "Make the size of "cb_handle_t" same for 32/64-bit"
7ea757df0311bfb7310a7a765dcec1b79f39f25d Merge "goldfish: camera: fix 64-bit warnings"
3725c7c982eac52ec64a625e82f306822452941c goldfish: camera: fix 64-bit warnings
eed789f036cbcedf2fa96ae3e273c2234102d340 Merge "goldfish: Fix /cache partition type."
f55ac4fc027ae3d97f4faaa6ccd65480f493dea7 goldfish: Fix /cache partition type.
690792a66c7fca6bf0aa17c2d5043ab86d145965 Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""
8853df9503e0edec6cac0e1e0840fa111d57a79a Revert "Revert "goldfish: cache image is not ext4. yet.""
d8a6e67044ddcac7c53adbe6b871c33447110905 Merge "Revert "goldfish: cache image is not ext4. yet.""
5e2caf7883279113d6f5f4777122dc88262c34c6 Revert "goldfish: cache image is not ext4. yet."
3f62b50d45441ae077c958423e9e301acd5dcc11 Make the size of "cb_handle_t" same for 32/64-bit
aec15d91ee48797f2b3c3fe61cca977900ebcd47 am
646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
646f0b25e63164950d1d99b9b8021be74c2321c6 Merge "opengl: rcOpenColorBuffer must be synchronous"
c542f3d8fc89678574b2fa650395f3dfac991a20 opengl: rcOpenColorBuffer must be synchronous
6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 am
2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."
2c6c08a23d2f5f760753745be5b67fe5759dcc91 Merge "Move goldfish from fdprintf to POSIX dprintf."
0228f8a1cdf5b2391201333de73fabab6d2ca72f Move goldfish from fdprintf to POSIX dprintf.
dbda557d4dcf022850ea4ab4f89e1c154e2aea04 am
5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
5cb5779ad0ad75a59bfb8ce42317a4ee18300281 Merge "gralloc: don't initialize reserved_proc"
e46eea0b5bdef28f5c42e4d7764b030679479354 gralloc: don't initialize reserved_proc
67334d0b9d0da7595daf07a3e9bea6a55436e296 Merge commit '
d9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD
7076e4647af737393baf020c13e81a090f4a9f26 Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"
3f92be74c1e9b2314d4c0f8feaacf7bafce7dedc Add 64-bit software GLES/EGL support in gralloc.goldfish module
61a8f0bbc146a4050a885e1e7c314dfc4ab72779 Merge "Fix the Chrome app crash in emulator issue"
bd93fee73b02d0b223b441c34a4f8e04eb57291d Merge "Support GLES acceleration in 64bit emulator on device side"
a1de8e2f5e4c29341be01bae364a54d92d14c742 Fix the Chrome app crash in emulator issue
4f94a5f8b13a5fdd80988e77dd5d468b958b0117 Merge "Remove the useless folder and files in emulator GLES/EGL drivers"
31aad5c0a0de056114b6bb843a5c37d8de6e46e4 Remove the useless folder and files in emulator GLES/EGL drivers
aedc716648071a1403f4ac92a380d1d4a5377052 Support GLES acceleration in 64bit emulator on device side
d9dc763708823aa865983bb8dc37b5ecc5669620 am
aedf829a: Merge "goldfish: cache image is not ext4. yet."
aedf829a920c3100de5caa49b0dec02d66eed96b Merge "goldfish: cache image is not ext4. yet."
a2543be45f35ab7ace3ecd92c99a3c72150622ec goldfish: cache image is not ext4. yet.
9dba558f4621d3d70a05c0a3d8e2c34b3883f866 am
48a76778: Merge "Remove #include <asm/page.h>."
644f53c8705586705c27b799e5b5f303118e8b3c am
155ca91c: Merge topic \'emu64\'
48a76778937abadf5cbd260696a29d737134d0d9 Merge "Remove #include <asm/page.h>."
1daf365476f888a5d9534607c8299a3b5160b4a7 Remove #include <asm/page.h>.
155ca91c1253bcb85a0eeec93ded6da07122d4ff Merge topic 'emu64'
324a0c43835b935721c938a2684874e0b5bf8311 Disable echo on all tty lines
8bb5f92dcd48dbbaa69ab15f97aca13d49b08599 ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe
5b31b113176dec8d7fcfb5650f3dd7b01baf605c am
48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
48107fa1dd354f8667b74f335c3f82f472b7d112 Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
5212e4a903d2654572b8bdde0bda3bdd6ecbee6e device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2061519f3e55ba1dac643cac34a4aa6f0f0dfeee am
44c72ca0: Merge "Vibra: Add the vibrator module for goldfish"
44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa Merge "Vibra: Add the vibrator module for goldfish"
0f41b57f2aa2ffa8fd90ebd50c13c2dd0249ee0f Vibra: Add the vibrator module for goldfish
ac534df6c39944a91f157819628db3d6f63b75f1 am
59922432: Merge commit \'
f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD
59922432be859a46eeb76650b24308505625da36 Merge commit '
f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD
144d2d5d683928f393a9567c443c8f5af13dfdd0 am
b9a62053: Merge commit \'
828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD
b9a62053cf74025a43c8baa118d52729e38cc176 Merge commit '
828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD
a648b35cca58d3d1608e1beb21028f91bd0b9df7 am
2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."
2befc3edc583afb43a4f6740f0af0534eac8e9d5 Merge "Modify the build targets for goldfish from to include aosp*."
bc233492e3ce3af8cc23496ee58cd3dc1b74d0f0 Modify the build targets for goldfish from to include aosp*.
f09bc5256e48a44eec9ca47ba838c12d0e89a198 am
b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"
b9a7de1a690bc638496e0550e6a9ebe859fc0315 Merge "Delete buffer data when removing it from the SharedGroup namespace"
8562d1b6e089254837da3ab2d272c65c3bb5d8c7 Delete buffer data when removing it from the SharedGroup namespace
f8b99f123467cd6164d071237f5dbe703f9ea2d7 am
6b151ca8: Merge "Catch divide by zero case in drawCheckerBoard() function."
6b151ca8833aa7271e311436dad97588b71b7a38 Merge "Catch divide by zero case in drawCheckerBoard() function."
d7cc5da79d828ec6cb21926be13265fc52715e2f am
84309165: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
84309165ca52b7446e388c13127fd6e305833f24 Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
46bcb5f7a64ccd440d5a292c7afd2e2b5c2bee4f Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.
b0b6afb44269263afa080ecc643f2c4866adfb38 Catch divide by zero case in drawCheckerBoard() function.
828bd482a1aeacf96d5f3a3e0701029d9f890c5f am
2524d396: Update emulator to FUSE-wrap its SD card.
2524d39681566f4eca7afb7950e05ab642978263 Update emulator to FUSE-wrap its SD card.
e8122dff1ef2de4d41835265a59d8960e7800fae camera3: Fix stream id types
3ad13188d4e7e873947040ec22a35d73efb76812 Camera2/3: Implement full-color NV21 output.
07da94023283a7be99fdde9b05e54d9204f7deff get rid of HAL pixelformats 5551 and 4444
a4c19be9274d8bb993f88a6a1cbd2ad92f4a48fa Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
ccb835ba267e927f7df759290bd46ac78712a3b2 Merge "Camera2/3: Update static metadata"
0049ee8925212a3a5ff095a8a66cab184adf8f1b Camera2/3: Update static metadata
8ff1e5f1e3e24baf311e6263b48f389c206f14ac am
8f9288ea: goldfish: use fstab.goldfish
8f9288eaf10b50d19038f5c7024616e147c64735 goldfish: use fstab.goldfish
e96a7c7da79939c509a7517f2b2de37e840a6390 Added net.dns1 prop for emulator, as Android emulator ignores it by default.
ff3a362fb9aca15285a95cad6baa08e961330e8e am
bf34d172: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
bf34d1722ea1ebdf779837611220b5269bd35968 Reconcile with jb-mr2-zeroday-release - do not merge
d9fcbd08b0413fedc8219237534ce31d6b7fd2f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a am
2c84e47e: am
07a4c8b4: Camera3: Fix default AE mode
2c84e47e3d0085b1222de94013c75c0328b02492 am
07a4c8b4: Camera3: Fix default AE mode
Change-Id: Iadb2d609051a33595ce915e638e0e40f9a4841a4
bohu [Mon, 2 Feb 2015 19:14:15 +0000 (19:14 +0000)]
am
66896fd9: Merge "Proper comment on the usage mode in gralloc_alloc"
* commit '
66896fd9f7716e027cec2060d05eca45e491c401':
Proper comment on the usage mode in gralloc_alloc
bohu [Mon, 2 Feb 2015 18:56:52 +0000 (10:56 -0800)]
Port back gles bug fixes and rotation fix
Following CLs are back ported:
3321abd96de0c05f5d0cfea88748b8abb3003672 Proper comment on the usage mode in gralloc_alloc
e163a3ce1e09c3ef3d1c2c4e0e46ff77fa28362c guest system gles fix: Enable screen capture with gpu on
ba65b320f09b4b3df0b9cbbb7224191099d62446 Fix previous commit error
717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
7152d7d9fc89cbecf81ad123cf8018fed38253a1 Upgrade goldfish sensor HAL module to 1_0
40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
7fa2b92de2058a3556e5f38a135de415bb3d5e45 Merge "Use more appropriate type in cb_handle_t::validate."
fe2c5beb964d2e2aecedb02b9cca592e0811d90b Use more appropriate type in cb_handle_t::validate.
376688e76694bf5b8672379c540b1bda059da682 Merge "ranchu: Fix goldfish_pipe definitions."
e3e686593cc8bdaf3ca4f6fa0b33b62a6951d1d6 ranchu: Fix goldfish_pipe definitions.
7fe478341c2ac6362d6864c99a8a65b5d7fd142d Merge "Upgrade goldfish sensor HAL module to 1_0"
58ab34d952685a7b8a52151d2e39bd58ee4f6041 Upgrade goldfish sensor HAL module to 1_0
7d3d0c99d2c82319e001289d1b9e091e5ff8f7aa Merge "ranchu: Add ARM64-specific root/ramdisk config files."
d0fead3c53d6e450deb69aad72651e132b6cc072 ranchu: Add ARM64-specific root/ramdisk config files.
638ee524f83053613c47ddea22c4bf98a0175c2f Merge "Remove display initialization from eglGetProcAddress API"
7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 Merge "Make the size of "cb_handle_t" same for 32/64-bit"
7ea757df0311bfb7310a7a765dcec1b79f39f25d Merge "goldfish: camera: fix 64-bit warnings"
3725c7c982eac52ec64a625e82f306822452941c goldfish: camera: fix 64-bit warnings
eed789f036cbcedf2fa96ae3e273c2234102d340 Merge "goldfish: Fix /cache partition type."
f55ac4fc027ae3d97f4faaa6ccd65480f493dea7 goldfish: Fix /cache partition type.
690792a66c7fca6bf0aa17c2d5043ab86d145965 Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""
8853df9503e0edec6cac0e1e0840fa111d57a79a Revert "Revert "goldfish: cache image is not ext4. yet.""
d8a6e67044ddcac7c53adbe6b871c33447110905 Merge "Revert "goldfish: cache image is not ext4. yet.""
5e2caf7883279113d6f5f4777122dc88262c34c6 Revert "goldfish: cache image is not ext4. yet."
3f62b50d45441ae077c958423e9e301acd5dcc11 Make the size of "cb_handle_t" same for 32/64-bit
aec15d91ee48797f2b3c3fe61cca977900ebcd47 am
646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
646f0b25e63164950d1d99b9b8021be74c2321c6 Merge "opengl: rcOpenColorBuffer must be synchronous"
c542f3d8fc89678574b2fa650395f3dfac991a20 opengl: rcOpenColorBuffer must be synchronous
6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 am
2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."
2c6c08a23d2f5f760753745be5b67fe5759dcc91 Merge "Move goldfish from fdprintf to POSIX dprintf."
0228f8a1cdf5b2391201333de73fabab6d2ca72f Move goldfish from fdprintf to POSIX dprintf.
dbda557d4dcf022850ea4ab4f89e1c154e2aea04 am
5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
5cb5779ad0ad75a59bfb8ce42317a4ee18300281 Merge "gralloc: don't initialize reserved_proc"
e46eea0b5bdef28f5c42e4d7764b030679479354 gralloc: don't initialize reserved_proc
67334d0b9d0da7595daf07a3e9bea6a55436e296 Merge commit '
d9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD
7076e4647af737393baf020c13e81a090f4a9f26 Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"
3f92be74c1e9b2314d4c0f8feaacf7bafce7dedc Add 64-bit software GLES/EGL support in gralloc.goldfish module
61a8f0bbc146a4050a885e1e7c314dfc4ab72779 Merge "Fix the Chrome app crash in emulator issue"
bd93fee73b02d0b223b441c34a4f8e04eb57291d Merge "Support GLES acceleration in 64bit emulator on device side"
a1de8e2f5e4c29341be01bae364a54d92d14c742 Fix the Chrome app crash in emulator issue
4f94a5f8b13a5fdd80988e77dd5d468b958b0117 Merge "Remove the useless folder and files in emulator GLES/EGL drivers"
31aad5c0a0de056114b6bb843a5c37d8de6e46e4 Remove the useless folder and files in emulator GLES/EGL drivers
aedc716648071a1403f4ac92a380d1d4a5377052 Support GLES acceleration in 64bit emulator on device side
d9dc763708823aa865983bb8dc37b5ecc5669620 am
aedf829a: Merge "goldfish: cache image is not ext4. yet."
aedf829a920c3100de5caa49b0dec02d66eed96b Merge "goldfish: cache image is not ext4. yet."
a2543be45f35ab7ace3ecd92c99a3c72150622ec goldfish: cache image is not ext4. yet.
9dba558f4621d3d70a05c0a3d8e2c34b3883f866 am
48a76778: Merge "Remove #include <asm/page.h>."
644f53c8705586705c27b799e5b5f303118e8b3c am
155ca91c: Merge topic \'emu64\'
48a76778937abadf5cbd260696a29d737134d0d9 Merge "Remove #include <asm/page.h>."
1daf365476f888a5d9534607c8299a3b5160b4a7 Remove #include <asm/page.h>.
155ca91c1253bcb85a0eeec93ded6da07122d4ff Merge topic 'emu64'
324a0c43835b935721c938a2684874e0b5bf8311 Disable echo on all tty lines
8bb5f92dcd48dbbaa69ab15f97aca13d49b08599 ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe
5b31b113176dec8d7fcfb5650f3dd7b01baf605c am
48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
48107fa1dd354f8667b74f335c3f82f472b7d112 Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
5212e4a903d2654572b8bdde0bda3bdd6ecbee6e device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2061519f3e55ba1dac643cac34a4aa6f0f0dfeee am
44c72ca0: Merge "Vibra: Add the vibrator module for goldfish"
44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa Merge "Vibra: Add the vibrator module for goldfish"
0f41b57f2aa2ffa8fd90ebd50c13c2dd0249ee0f Vibra: Add the vibrator module for goldfish
ac534df6c39944a91f157819628db3d6f63b75f1 am
59922432: Merge commit \'
f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD
59922432be859a46eeb76650b24308505625da36 Merge commit '
f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD
144d2d5d683928f393a9567c443c8f5af13dfdd0 am
b9a62053: Merge commit \'
828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD
b9a62053cf74025a43c8baa118d52729e38cc176 Merge commit '
828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD
a648b35cca58d3d1608e1beb21028f91bd0b9df7 am
2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."
2befc3edc583afb43a4f6740f0af0534eac8e9d5 Merge "Modify the build targets for goldfish from to include aosp*."
bc233492e3ce3af8cc23496ee58cd3dc1b74d0f0 Modify the build targets for goldfish from to include aosp*.
f09bc5256e48a44eec9ca47ba838c12d0e89a198 am
b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"
b9a7de1a690bc638496e0550e6a9ebe859fc0315 Merge "Delete buffer data when removing it from the SharedGroup namespace"
8562d1b6e089254837da3ab2d272c65c3bb5d8c7 Delete buffer data when removing it from the SharedGroup namespace
f8b99f123467cd6164d071237f5dbe703f9ea2d7 am
6b151ca8: Merge "Catch divide by zero case in drawCheckerBoard() function."
6b151ca8833aa7271e311436dad97588b71b7a38 Merge "Catch divide by zero case in drawCheckerBoard() function."
d7cc5da79d828ec6cb21926be13265fc52715e2f am
84309165: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
84309165ca52b7446e388c13127fd6e305833f24 Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
46bcb5f7a64ccd440d5a292c7afd2e2b5c2bee4f Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.
b0b6afb44269263afa080ecc643f2c4866adfb38 Catch divide by zero case in drawCheckerBoard() function.
828bd482a1aeacf96d5f3a3e0701029d9f890c5f am
2524d396: Update emulator to FUSE-wrap its SD card.
Change-Id: Ie4ae8266f0077fc619398d8a94a6eba0e1414ae9
bohu [Mon, 2 Feb 2015 18:17:40 +0000 (10:17 -0800)]
Proper comment on the usage mode in gralloc_alloc
Original usage validation is invalid for screen capture mode.
This CL removes the dead code and clarify the comment.
Change-Id: Ic14c1482aa431993f10e8ae1133e6513809b6606
bohu [Thu, 29 Jan 2015 21:49:06 +0000 (13:49 -0800)]
resolved conflicts for merge of
dd14cf86 to lmp-mr1-dev-plus-aosp
Change-Id: I128516966bf0949a7079269d8923daf5a7b9a112
bohu [Mon, 26 Jan 2015 17:25:23 +0000 (09:25 -0800)]
guest system gles fix: Enable screen capture with gpu on
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
bohu [Tue, 27 Jan 2015 17:37:45 +0000 (17:37 +0000)]
am
9d209a04: Merge "guest system gles fix: Enable screen capture with gpu on"
* commit '
9d209a04465a41ccf3eb5267f66b588c16f36234':
guest system gles fix: Enable screen capture with gpu on
bohu [Mon, 26 Jan 2015 17:25:23 +0000 (09:25 -0800)]
guest system gles fix: Enable screen capture with gpu on
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
Change-Id: I24b91bb70669fe2ddad3a5fc2eaccf3f3eaa0e1b
Bo Hu [Fri, 23 Jan 2015 00:50:33 +0000 (00:50 +0000)]
am
7d9f6e9b: Merge "Set proper error code for glShaderBinary function"
* commit '
7d9f6e9b35c43e19b810a089557e561f5f2b63bf':
Set proper error code for glShaderBinary function
Bo Hu [Thu, 22 Jan 2015 23:35:44 +0000 (23:35 +0000)]
Merge "Set proper error code for glShaderBinary function"
Bo Hu [Wed, 21 Jan 2015 00:29:50 +0000 (16:29 -0800)]
Set proper error code for glShaderBinary function
This function is not supported, but we still need to set proper error
code when it is called, instead of doing nothing.
Change-Id: I3f880e9b5e661fe4bd8e8f51f38df71c24b420e5
bohu [Thu, 15 Jan 2015 03:58:14 +0000 (03:58 +0000)]
am
6d171076: Merge "opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions."
* commit '
6d171076e8a5d1c6302efc48e7c558863b36a6e4':
opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions.
bohu [Wed, 14 Jan 2015 17:46:36 +0000 (09:46 -0800)]
opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions.
This fix handles NULL values of 'size' and 'type' in
glGetActiveAttrib and glGetActiveUniform.
This patch updates the encoder sources to match the auto-generated
output of the latest 'emugen' tools from sdk/emulator/opengl/
Generated by using external/qemu/distrib/update-emugl-source.sh
related change:
82aa88b78e26b048e428a930a867166eff611984
Change-Id: Ifbd9e8bf3473ed054e95e1ee3a7885652c2002ce
Bo Hu [Wed, 17 Dec 2014 20:36:46 +0000 (20:36 +0000)]
am
28a1a16e: Merge "Add parameters validation to glShaderSource() API"
* commit '
28a1a16e736d196b2b076f7a8402d365bee28511':
Add parameters validation to glShaderSource() API
Bo Hu [Wed, 17 Dec 2014 20:23:36 +0000 (20:23 +0000)]
Merge "Add parameters validation to glShaderSource() API"
Ying Wang [Tue, 16 Dec 2014 21:05:59 +0000 (21:05 +0000)]
am
ba8d44b1: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
ba8d44b1ae7f5d39992dc0b59aecf56f8c81ee2a':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:31:03 +0000 (12:31 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: Ic464d98babf86e5bf76c3bacc875926968726cf9
bohu [Fri, 12 Dec 2014 17:06:05 +0000 (17:06 +0000)]
am
069592df: Merge "Add shader version to glGetString"
* commit '
069592dfc42a4f435b2d7fb2a5bdfb51ab7e26fa':
Add shader version to glGetString
bohu [Fri, 12 Dec 2014 00:53:07 +0000 (16:53 -0800)]
Add shader version to glGetString
When querry shader version, current implementation returns
null. This commit fixes it.
Change-Id: If9b7c0ba3bb2bc48d0b7404529254834fff6ee5c
Tina Zhang [Thu, 4 Dec 2014 04:37:30 +0000 (12:37 +0800)]
Add parameters validation to glShaderSource() API
According to GLES2.0 Spec., add parameters validataion to
glShaderSource() API.
Change-Id: I5b0e939fd9657ccbb40a13896c8fc74ef02fd085
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
bohu [Wed, 10 Dec 2014 22:23:22 +0000 (22:23 +0000)]
am
8142de3a: Fix a missed function override in GLEncoder.cpp
* commit '
8142de3a67193062b0aa41cd197b473089b135df':
Fix a missed function override in GLEncoder.cpp
bohu [Wed, 10 Dec 2014 00:39:11 +0000 (16:39 -0800)]
Fix a missed function override in GLEncoder.cpp
glColorPointer override was missed and this commit fixes that.
(cherry picked from commit
2e74d05cf71810cd25ac69d656c3bfa01aef7907)
Change-Id: I8b303c5751aa38bd246903aeb418815f9ffd97f5
David Turner [Wed, 10 Dec 2014 09:03:32 +0000 (09:03 +0000)]
am
5f23bd4a: Merge "Fix a missed function override in GLEncoder.cpp"
* commit '
5f23bd4a95e854a2a7f01ddbda17bb858873ad44':
Fix a missed function override in GLEncoder.cpp
bohu [Wed, 10 Dec 2014 00:39:11 +0000 (16:39 -0800)]
Fix a missed function override in GLEncoder.cpp
glColorPointer override was missed and this commit fixes that.
Change-Id: I6f51c57fa6b6d8af0802d06cf42994fbb3bc80b9
bohu [Wed, 3 Dec 2014 20:43:21 +0000 (20:43 +0000)]
am
8d97f574: Update goldfish from aosp/master
* commit '
8d97f57470bcb540bf7bf60c0b23391942838271':
Update goldfish from aosp/master
bohu [Tue, 2 Dec 2014 19:44:44 +0000 (11:44 -0800)]
Update goldfish from aosp/master
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
bohu [Mon, 1 Dec 2014 17:19:54 +0000 (17:19 +0000)]
am
8e0631aa: Merge "Fix eglDestroyContext and glTexImage2D"
* commit '
8e0631aab1cdc64d01d176cfaf5ca721cbe3f24d':
Fix eglDestroyContext and glTexImage2D
bohu [Mon, 1 Dec 2014 17:12:39 +0000 (17:12 +0000)]
Merge "Fix eglDestroyContext and glTexImage2D"
David 'Digit' Turner [Fri, 28 Nov 2014 10:15:13 +0000 (10:15 +0000)]
am
9e7edffa: Merge "opengl: Fix pixelDataSize() ambiguity."
* commit '
9e7edffa39c08f29a712ee346de84971eb7e1d70':
opengl: Fix pixelDataSize() ambiguity.
David 'Digit' Turner [Thu, 27 Nov 2014 17:05:34 +0000 (18:05 +0100)]
opengl: Fix pixelDataSize() ambiguity.
The GLESv1 encoder library was calling the pixelDataSize() function
definition from the GLESv2 encoder library, resulting in bugs, like
the inability to see the boot animation when -gpu on is used.
This fixes the issue by using namespaces to differentiate the
two implementations. Note that the auto-generated files have been
updated by re-running update-emugl-sources.sh as specified by
opengl/README after applying the following patches:
https://android-review.googlesource.com/#/c/116642/
https://android-review.googlesource.com/#/c/116643/
https://android-review.googlesource.com/#/c/116644/
Change-Id: Idbd84fb6ca5934cbb9af009b09f9a38cc4a1340a
bohu [Wed, 26 Nov 2014 00:50:37 +0000 (16:50 -0800)]
Fix eglDestroyContext and glTexImage2D
1. When destroy context that is in use, EGL spec says:
"If the EGL rendering context context is not current to any thread,
eglDestroyContext destroys it immediately. Otherwise, context is
destroyed when it becomes not current to any thread."
2. When calling glTexImage2D, should bind the correct texture first.
Change-Id: I6c779b71d1e6002b8a484477921ba323acbd986e
bohu [Tue, 18 Nov 2014 20:05:06 +0000 (20:05 +0000)]
am
c2f84745: Merge "handles glGetBooleanv when value is nonboolean"
* commit '
c2f8474518a220b3c1b86b6d4f9fa28ed9bb734a':
handles glGetBooleanv when value is nonboolean
bohu [Tue, 18 Nov 2014 19:57:09 +0000 (19:57 +0000)]
Merge "handles glGetBooleanv when value is nonboolean"
bohu [Tue, 18 Nov 2014 19:54:54 +0000 (19:54 +0000)]
am
7041a479: Merge "Properly initialize GLClientState\'s m_states"
* commit '
7041a479c7181b9b6caf27d471b5b7e36cefb46f':
Properly initialize GLClientState's m_states
bohu [Tue, 18 Nov 2014 00:28:42 +0000 (16:28 -0800)]
handles glGetBooleanv when value is nonboolean
Properly converts non-zero value to GL_TRUE.
Change-Id: I9ca1d42d9b36ae9ce0a01cf6a358d9fe59a02558
bohu [Tue, 18 Nov 2014 00:40:52 +0000 (16:40 -0800)]
Properly initialize GLClientState's m_states
The data pointer of m_states[i] should be initialized to 0; otherwise
it contains garbage.
Change-Id: Ibfa9bb6fec395de6ac98a3e6b91d4c6ff4143f2c
bohu [Mon, 17 Nov 2014 22:59:14 +0000 (22:59 +0000)]
am
6aedefac: Merge "Unbind buffer when buffer is deleted"
* commit '
6aedefacbd932dd340d0f7e96b6f6aff2aba4558':
Unbind buffer when buffer is deleted
bohu [Mon, 17 Nov 2014 22:45:41 +0000 (22:45 +0000)]
Merge "Unbind buffer when buffer is deleted"
bohu [Fri, 7 Nov 2014 02:08:07 +0000 (18:08 -0800)]
Unbind buffer when buffer is deleted
When buffer is deleted, it should be un-bind also.
Also fix error code related to buffer
Change-Id: I3e7ec88399822469a36119c2de03157a2bbea812
David 'Digit' Turner [Fri, 31 Oct 2014 22:20:25 +0000 (22:20 +0000)]
am
363a70bc: am
3fe2263e: Merge "opengl: Fix 64-bit build."
* commit '
363a70bcd4f1dbde18868a236e556edcd775ce3d':
opengl: Fix 64-bit build.
David 'Digit' Turner [Fri, 31 Oct 2014 22:17:25 +0000 (22:17 +0000)]
am
3fe2263e: Merge "opengl: Fix 64-bit build."
* commit '
3fe2263e2429a0611796e3e84c6f8b54bc30aa48':
opengl: Fix 64-bit build.
David 'Digit' Turner [Fri, 31 Oct 2014 22:11:27 +0000 (23:11 +0100)]
opengl: Fix 64-bit build.
A previous patch broke the 64-bit with the following error message:
device/generic/goldfish/opengl/system/egl/egl.cpp: In function 'EGLBoolean eglGetConfigs(EGLDisplay, void**, EGLint, EGLint*)':
device/generic/goldfish/opengl/system/egl/egl.cpp:559:33: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
*configs++ = (EGLConfig)i;
This was due to the fact that the type of |i| went from uintptr_t to int.
This patch fixes the issue by casting i to (EGLConfig)(uintptr_t)i.
Change-Id: I3158c91d63b13eff3f8e8babb1faba8b58dc7373
David 'Digit' Turner [Fri, 31 Oct 2014 16:33:42 +0000 (16:33 +0000)]
am
54284eb6: resolved conflicts for merge of
5a7d8f2d to stage-aosp-master
* commit '
54284eb63c164d924f39f15086e55c65d8e6833f':
opengl: Regenerate GPU emulation encoder sources.
opengl: Remove compiler warnings.
opengl: Remove accessor functions from encoders.
opengl: Fix a few function name typos.
David 'Digit' Turner [Fri, 31 Oct 2014 15:27:34 +0000 (16:27 +0100)]
resolved conflicts for merge of
5a7d8f2d to stage-aosp-master
Change-Id: I4ce3cee422f8e98d70bbf2ffcaac34650c7182b4
David 'Digit' Turner [Fri, 31 Oct 2014 10:39:38 +0000 (11:39 +0100)]
opengl: Regenerate GPU emulation encoder sources.
This patch updates the encoder sources to match the auto-generated
output of the latest 'emugen' tools from sdk/emulator/opengl/
Generated by using external/qemu/distrib/update-emugl-source.sh
This shall only results in minor changes:
- Minor indentation fixes.
- Using 'const' to define constant tables.
- Using anonymous namespaces in the encoders.
Change-Id: Ib282b31c4c05da897157ef90e5a9deb914a08bda
Bill Yi [Thu, 30 Oct 2014 20:50:06 +0000 (20:50 +0000)]
am
c1a91516: Fix build which is due to a poor merge
* commit '
c1a91516fefca31994dc45a8a634a88eaf6a129f':
Fix build which is due to a poor merge
Bill Yi [Thu, 30 Oct 2014 20:39:22 +0000 (13:39 -0700)]
Fix build which is due to a poor merge
Related commit:
fbb8828965084a753f04263f3265d68acbfdc7ab
BUG:
18155628
David 'Digit' Turner [Thu, 30 Oct 2014 20:32:28 +0000 (21:32 +0100)]
opengl: Remove compiler warnings.
Simply remove multiple compiler warnings about unused parameter.
Note that this modifies three auto-generated files, which will
require fixing the 'emugen' program in the future.
Change-Id: I19edce7c6480770b893d033ed6b1c65744091d62
David 'Digit' Turner [Thu, 30 Oct 2014 17:15:04 +0000 (18:15 +0100)]
opengl: Remove accessor functions from encoders.
These functions are not necessary since all the fields are
public members of structures. Also gets us closer to the state
of the real emugen output, which isn't matched yet due to other
differences.
Change-Id: Iea092beca7e3a819c286fe3d84897e6a170747f8
David 'Digit' Turner [Thu, 30 Oct 2014 17:07:56 +0000 (18:07 +0100)]
opengl: Fix a few function name typos.
A small preliminary patch to make future patches slightly
simpler, easier to merge into the internal tree.
Change-Id: Iec649b61349106d4531a6e28141c0f0687a144c5
David 'Digit' Turner [Thu, 30 Oct 2014 10:39:56 +0000 (10:39 +0000)]
am
fbb88289: resolved conflicts for merge of
7472654e to stage-aosp-master
* commit '
fbb8828965084a753f04263f3265d68acbfdc7ab':
Fix GPU emulation crash.
David 'Digit' Turner [Thu, 30 Oct 2014 10:30:02 +0000 (11:30 +0100)]
resolved conflicts for merge of
7472654e to stage-aosp-master
Change-Id: Ieda2d8d1ac00854de28959e4632827a12b399cf2
David 'Digit' Turner [Wed, 29 Oct 2014 08:55:08 +0000 (09:55 +0100)]
Fix GPU emulation crash.
This patch fixes the crash that occurs during boot when the
boot animation starts. The main issue is that the wrong version of
glGenTextures_enc() was being called.
The root issue is that libGLESv1_CM_emulation.so, which implements the
GLESv1 API in the system, is linked to both libGLESv2_enc.so and
libGLESv1_enc.so which both provided a glGenTextures_enc() function, used to
encode a glGenTextures() command call into the wire protocol.
Until recently, and due to pure luck, the function call in
libGLESv1_CM_emulation.so was resolved to the function in libGLESv1.so, which is
the correct version to use from this library.
However, due to recent changes in the dynamic linker's symbol resolution
implementation, the version in libGLESv2.so was being used instead. The bug is
really in our library and this patch provides a fix by removing the duplicate
functions, with the help of C++ namespaces.
NOTE: This patch modifies auto-generated code. A better fix would be to
fix the generator, then refresh the sources with its new output.
However, several other manual patches have been performed on these
files in the past too to fix other issues, so doing so would lose
the fixes.
A future patch will update the generator, and refresh all sources
accordingly. This is a "quick-fix" to get us to a proper booting
state.
NOTE: Even after applying this patch, the system boots to the 'home screen'
but fails to display the boot animation.
BUG=
18146046
Change-Id: I48cab73ad583e303723340e80d19a82fa301b61d
Bill Yi [Sat, 25 Oct 2014 19:52:27 +0000 (19:52 +0000)]
bohu [Wed, 22 Oct 2014 21:26:57 +0000 (21:26 +0000)]
am
758ef0bc: Merge aosp/master fixes into lmp-dev
* commit '
758ef0bc56397ba50f96b7b9109cb6c50a7cdf29':
Merge aosp/master fixes into lmp-dev
Bill Yi [Wed, 22 Oct 2014 15:46:29 +0000 (08:46 -0700)]
bohu [Tue, 21 Oct 2014 21:02:45 +0000 (14:02 -0700)]
Merge aosp/master fixes into lmp-dev
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
bohu [Tue, 21 Oct 2014 17:20:24 +0000 (17:20 +0000)]
am
dc69376b: Merge "Handle empty data parameter in glTexSubImage2D_enc"
* commit '
dc69376bd3d1c65ad19abfc036a85266b2199136':
Handle empty data parameter in glTexSubImage2D_enc
bohu [Tue, 21 Oct 2014 17:20:15 +0000 (17:20 +0000)]
am
45d03a06: Merge "Allow glGetProgramInfoLog_enc to have empty length"
* commit '
45d03a067a753d50e7aeb2ab50048db851538ab8':
Allow glGetProgramInfoLog_enc to have empty length
bohu [Tue, 21 Oct 2014 17:20:15 +0000 (17:20 +0000)]
am
d7486c9c: Merge "Guard against negative buffer size"
* commit '
d7486c9cd3ff87cfda193cf5fca1d2f5ec0f7316':
Guard against negative buffer size
bohu [Tue, 21 Oct 2014 17:20:14 +0000 (17:20 +0000)]
am
b86347c7: Merge "Guard against negative width and height"
* commit '
b86347c7f68c9739fcddf1338cc4fcd6ca9b3e2a':
Guard against negative width and height
bohu [Tue, 21 Oct 2014 17:20:14 +0000 (17:20 +0000)]
am
7f075373: Merge "Handle empty buffer in QemuPipeStream::writeFully"
* commit '
7f07537302645d942da3f08c65f8f0a2bb842748':
Handle empty buffer in QemuPipeStream::writeFully
bohu [Tue, 21 Oct 2014 17:11:34 +0000 (17:11 +0000)]
Merge "Handle empty data parameter in glTexSubImage2D_enc"
bohu [Tue, 21 Oct 2014 17:10:56 +0000 (17:10 +0000)]
Merge "Allow glGetProgramInfoLog_enc to have empty length"
bohu [Tue, 21 Oct 2014 17:10:28 +0000 (17:10 +0000)]
Merge "Guard against negative buffer size"
bohu [Tue, 21 Oct 2014 17:09:47 +0000 (17:09 +0000)]
Merge "Guard against negative width and height"
bohu [Fri, 17 Oct 2014 23:38:50 +0000 (16:38 -0700)]
Handle empty data parameter in glTexSubImage2D_enc
Empty data parameter crashes emulator, this commit checks and handles
it properly.
Change-Id: Iee468bdc555acc1e0c87b38bd7f09ffd8f22b937
bohu [Fri, 17 Oct 2014 22:35:48 +0000 (15:35 -0700)]
Guard against negative buffer size
When negative buffer sizes are passed, emulator crashes. This commit
checks the buffer size and handles properly.
Change-Id: I223d5f5bcde2455e4b39354f9527dceb193b8e47
bohu [Fri, 17 Oct 2014 20:48:06 +0000 (13:48 -0700)]
Guard against negative width and height
When negative width or height passes into pixelDataSize, some bogus
values are returned. This commit checks both width and height to make
sure they are valid.
Change-Id: Ia49a9f464e6bb4894207ca4e07bbfdf34fbe741d
bohu [Fri, 17 Oct 2014 18:41:52 +0000 (11:41 -0700)]
Allow glGetProgramInfoLog_enc to have empty length
OpenGL standard allows empty length parameter and we should
handle it properly to avoid crashing emulator.
Change-Id: I07c1f726ee9d789fcba53986b724b8f4a1f07cf2
bohu [Fri, 17 Oct 2014 18:26:36 +0000 (11:26 -0700)]
Handle empty buffer in QemuPipeStream::writeFully
Print error message and return 0 when this happens (and it does happen),
similar to what QemuPipeStream::readFully does.
Change-Id: I14f2f2877e6b22e676d5bfe34a54435220e46127
bohu [Tue, 14 Oct 2014 17:30:22 +0000 (17:30 +0000)]
am
9c6d3726: Merge "Fix emulator crashes on glDrawElements command"
* commit '
9c6d37269b85c41203a2f061958922315d55f6ce':
Fix emulator crashes on glDrawElements command
bohu [Tue, 14 Oct 2014 17:30:18 +0000 (17:30 +0000)]
am
9c6d3726: Merge "Fix emulator crashes on glDrawElements command"
* commit '
9c6d37269b85c41203a2f061958922315d55f6ce':
Fix emulator crashes on glDrawElements command
bohu [Mon, 13 Oct 2014 18:45:06 +0000 (11:45 -0700)]
Fix emulator crashes on glDrawElements command
The current implementation does not properly handle the case when
glDrawElements is called without a buffer binded. This commit
fixes this problem and fixes the crash.
Change-Id: Ic7a5b2fb90c860dad878ed53a369349d479ba4e5
Bo Hu [Tue, 30 Sep 2014 23:57:35 +0000 (23:57 +0000)]
am
7fa2b92d: Merge "Use more appropriate type in cb_handle_t::validate."
* commit '
7fa2b92de2058a3556e5f38a135de415bb3d5e45':
Use more appropriate type in cb_handle_t::validate.
Bo Hu [Tue, 30 Sep 2014 23:54:57 +0000 (23:54 +0000)]
am
7fa2b92d: Merge "Use more appropriate type in cb_handle_t::validate."
* commit '
7fa2b92de2058a3556e5f38a135de415bb3d5e45':
Use more appropriate type in cb_handle_t::validate.
Alex Vallée [Wed, 24 Sep 2014 18:05:22 +0000 (14:05 -0400)]
Use more appropriate type in cb_handle_t::validate.
The interface specified by the HWC hal includes const native_handle
(through a typedef) which makes it annoying to const_cast away in order
to call validate.
Validate does not change the handle so this is safe.
Change-Id: I78b2997eb24074c186ab2d497b2faf332c7f4a85
Vince Harron [Fri, 19 Sep 2014 21:14:26 +0000 (21:14 +0000)]
am
6dc9b1b6: Merge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-dev
* commit '
6dc9b1b64a3a01ddcce9e664dc0153021a595130':
Make the size of "cb_handle_t" same for 32/64-bit
Tina Zhang [Fri, 19 Sep 2014 21:14:25 +0000 (21:14 +0000)]
am
6c6a12d1: Remove display initialization from eglGetProcAddress API
* commit '
6c6a12d1652c8872ae25162040224133888bf97a':
Remove display initialization from eglGetProcAddress API
Vince Harron [Fri, 19 Sep 2014 20:52:56 +0000 (20:52 +0000)]
am
6dc9b1b6: Merge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-dev
* commit '
6dc9b1b64a3a01ddcce9e664dc0153021a595130':
Make the size of "cb_handle_t" same for 32/64-bit
Tina Zhang [Fri, 19 Sep 2014 20:52:55 +0000 (20:52 +0000)]
am
6c6a12d1: Remove display initialization from eglGetProcAddress API
* commit '
6c6a12d1652c8872ae25162040224133888bf97a':
Remove display initialization from eglGetProcAddress API
Vince Harron [Fri, 19 Sep 2014 20:35:28 +0000 (20:35 +0000)]
Merge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-dev
Tina Zhang [Wed, 23 Jul 2014 08:34:48 +0000 (16:34 +0800)]
Remove display initialization from eglGetProcAddress API
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
Tina Zhang [Mon, 26 May 2014 06:03:48 +0000 (14:03 +0800)]
Make the size of "cb_handle_t" same for 32/64-bit
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
David Turner [Thu, 24 Jul 2014 13:28:52 +0000 (13:28 +0000)]
am
638ee524: Merge "Remove display initialization from eglGetProcAddress API"
* commit '
638ee524f83053613c47ddea22c4bf98a0175c2f':
Remove display initialization from eglGetProcAddress API
David Turner [Thu, 24 Jul 2014 13:20:52 +0000 (13:20 +0000)]
Merge "Remove display initialization from eglGetProcAddress API"
Tina Zhang [Wed, 23 Jul 2014 08:34:48 +0000 (16:34 +0800)]
Remove display initialization from eglGetProcAddress API
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.
Change-Id: I74ddc0db5c91c84afe0916f118937ef8f891b162
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Signed-off-by: WeixingX Tian <weixingx.tian@intel.com>
David Turner [Thu, 17 Jul 2014 13:00:57 +0000 (13:00 +0000)]
am
9b1e6c5a: Merge "Make the size of "cb_handle_t" same for 32/64-bit"
* commit '
9b1e6c5a3ccd943b7158dce83387fbfcc1162d69':
Make the size of "cb_handle_t" same for 32/64-bit