OSDN Git Service

android-x86/device-generic-goldfish-opengl.git
9 years agoam 7f721057: (-s ours) resolved conflicts for merge of 52667f55 to klp-modular-dev
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

9 years agoresolved conflicts for merge of 52667f55 to klp-modular-dev
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

9 years agoPort back gles bug fixes and rotation fix
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

9 years agoguest 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

(cherry picked from commit 5a50ac8819525f851c677be88a466b14737dbb18)

Change-Id: Ie9307eda411ab3d0b3842fbb4a71926dd62a1875

9 years agoFix 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

9 years agoUpdate 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

9 years agoMerge aosp/master fixes into lmp-dev
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

9 years agoMerge "Make the size of "cb_handle_t" same for 32/64-bit" into lmp-dev
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

9 years agoRemove 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.

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

9 years agoMake the size of "cb_handle_t" same for 32/64-bit
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

10 years agoam cdd78a38: am aec15d91: am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synch...
Jesse Hall [Wed, 28 May 2014 21:08:32 +0000 (21:08 +0000)]
am cdd78a38: am aec15d91: am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"

* commit 'cdd78a386dff8438a66d40abb4fa9c639c57b89c':
  opengl: rcOpenColorBuffer must be synchronous

10 years agoam dc684041: am c04a27cb: opengl: rcOpenColorBuffer must be synchronous
Jesse Hall [Wed, 28 May 2014 21:04:56 +0000 (21:04 +0000)]
am dc684041: am c04a27cb: opengl: rcOpenColorBuffer must be synchronous

* commit 'dc684041d9fbfd3b7db6fb0294286764d92564d0':
  opengl: rcOpenColorBuffer must be synchronous

10 years agoam aec15d91: am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
Jesse Hall [Wed, 28 May 2014 21:04:52 +0000 (21:04 +0000)]
am aec15d91: am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"

* commit 'aec15d91ee48797f2b3c3fe61cca977900ebcd47':
  opengl: rcOpenColorBuffer must be synchronous

10 years agoam 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
Jesse Hall [Wed, 28 May 2014 21:01:14 +0000 (21:01 +0000)]
am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"

* commit '646f0b25e63164950d1d99b9b8021be74c2321c6':
  opengl: rcOpenColorBuffer must be synchronous

10 years agoam c04a27cb: opengl: rcOpenColorBuffer must be synchronous
Jesse Hall [Wed, 28 May 2014 20:59:24 +0000 (20:59 +0000)]
am c04a27cb: opengl: rcOpenColorBuffer must be synchronous

* commit 'c04a27cb9a25ba26893212914fd725a85f8d6694':
  opengl: rcOpenColorBuffer must be synchronous

10 years agoopengl: rcOpenColorBuffer must be synchronous
Jesse Hall [Tue, 27 May 2014 16:25:24 +0000 (09:25 -0700)]
opengl: rcOpenColorBuffer must be synchronous

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

10 years agoopengl: rcOpenColorBuffer must be synchronous
Jesse Hall [Tue, 27 May 2014 16:25:24 +0000 (09:25 -0700)]
opengl: rcOpenColorBuffer must be synchronous

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

10 years agoopengl: Fix const-ness of GLES prototypes to match new headers
Jesse Hall [Wed, 21 May 2014 21:55:46 +0000 (14:55 -0700)]
opengl: Fix const-ness of GLES prototypes to match new headers

Bug: 1502849
Change-Id: I902517c23354e14f9c63b1584db286d682315bb5

10 years agoam dbda557d: am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
Greg Hackmann [Mon, 12 May 2014 18:09:06 +0000 (18:09 +0000)]
am dbda557d: am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"

* commit 'dbda557d4dcf022850ea4ab4f89e1c154e2aea04':
  gralloc: don't initialize reserved_proc

10 years agoam 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
Greg Hackmann [Mon, 12 May 2014 18:04:52 +0000 (18:04 +0000)]
am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"

* commit '5cb5779ad0ad75a59bfb8ce42317a4ee18300281':
  gralloc: don't initialize reserved_proc

10 years agogralloc: don't initialize reserved_proc
Greg Hackmann [Fri, 9 May 2014 22:34:54 +0000 (15:34 -0700)]
gralloc: don't initialize reserved_proc

gcc supports designated initializers in C++ mode as an extension, but
*only* when all of the specified fields are at the beginning of the
struct.  Hence initializing reserved_proc breaks compilation when new
procs are added.

Initializing reserved_proc makes a (spurious) warning go away, so
instead directly suppress that warning.

Change-Id: I279b7070b1aa7068c23fb59422589ff31980432d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
10 years agoam 67334d0b: Merge commit \'d9dc763708823aa865983bb8dc37b5ecc5669620\' into HEAD
Bill Yi [Wed, 30 Apr 2014 00:17:06 +0000 (00:17 +0000)]
am 67334d0b: Merge commit \'d9dc763708823aa865983bb8dc37b5ecc5669620\' into HEAD

* commit '67334d0b9d0da7595daf07a3e9bea6a55436e296':

10 years agoMerge commit 'd9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD
Bill Yi [Tue, 29 Apr 2014 18:33:40 +0000 (11:33 -0700)]
Merge commit 'd9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD

10 years agoam 7076e464: Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"
Jesse Hall [Mon, 21 Apr 2014 18:57:13 +0000 (18:57 +0000)]
am 7076e464: Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"

* commit '7076e4647af737393baf020c13e81a090f4a9f26':
  Add 64-bit software GLES/EGL support in gralloc.goldfish module

10 years agoAdd 64-bit software GLES/EGL support in gralloc.goldfish module
Tina Zhang [Fri, 18 Apr 2014 06:21:23 +0000 (14:21 +0800)]
Add 64-bit software GLES/EGL support in gralloc.goldfish module

If the emulator chooses running without using the host GPU to
do the GLES/EGL acceleration, the gralloc.goldfish module
must let the emulator use gralloc.default module which
can support the software GLES/EGL. Add this support for
64-bit emulator.

Change-Id: I241e70ce26a8f0298a32e3a55037fc3028a2e2a7
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
10 years agoam 61a8f0bb: Merge "Fix the Chrome app crash in emulator issue"
David Turner [Mon, 14 Apr 2014 14:41:39 +0000 (14:41 +0000)]
am 61a8f0bb: Merge "Fix the Chrome app crash in emulator issue"

* commit '61a8f0bbc146a4050a885e1e7c314dfc4ab72779':
  Fix the Chrome app crash in emulator issue

10 years agoMerge "Fix the Chrome app crash in emulator issue"
David Turner [Mon, 14 Apr 2014 14:35:21 +0000 (14:35 +0000)]
Merge "Fix the Chrome app crash in emulator issue"

10 years agoam bd93fee7: Merge "Support GLES acceleration in 64bit emulator on device side"
David Turner [Sat, 12 Apr 2014 00:15:12 +0000 (00:15 +0000)]
am bd93fee7: Merge "Support GLES acceleration in 64bit emulator on device side"

* commit 'bd93fee73b02d0b223b441c34a4f8e04eb57291d':
  Support GLES acceleration in 64bit emulator on device side

10 years agoMerge "Support GLES acceleration in 64bit emulator on device side"
David Turner [Sat, 12 Apr 2014 00:11:09 +0000 (00:11 +0000)]
Merge "Support GLES acceleration in 64bit emulator on device side"

10 years agoFix the Chrome app crash in emulator issue
Tina Zhang [Thu, 10 Apr 2014 08:53:36 +0000 (16:53 +0800)]
Fix the Chrome app crash in emulator issue

The TLS desctuctor callback function eglReleaseThread needs to
access EGLThreadInfo but it has been released by tlsDestruct.
That causes the crash issue when Chrome app is opened.
Change the EGLThreadInfo pointer value to NULL just after
EGLThreadInfo object is released, can fix the problem.

Change-Id: I7cdc7bdcd602af00369e570b0d2be168b76143a6
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
10 years agoam 4f94a5f8: Merge "Remove the useless folder and files in emulator GLES/EGL drivers"
David Turner [Wed, 9 Apr 2014 16:59:35 +0000 (16:59 +0000)]
am 4f94a5f8: Merge "Remove the useless folder and files in emulator GLES/EGL drivers"

* commit '4f94a5f8b13a5fdd80988e77dd5d468b958b0117':
  Remove the useless folder and files in emulator GLES/EGL drivers

10 years agoRemove the useless folder and files in emulator GLES/EGL drivers
Tina Zhang [Tue, 8 Apr 2014 01:15:07 +0000 (09:15 +0800)]
Remove the useless folder and files in emulator GLES/EGL drivers

Files in OpenglOsUtils folder are useless for emulator GLES/EGL drivers.
Remove them to simplify the content.

Change-Id: I0a3cb572328cfa22b8567e8cd938f2a228f6167a
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
10 years agoSupport GLES acceleration in 64bit emulator on device side
Tina Zhang [Fri, 21 Mar 2014 00:14:41 +0000 (08:14 +0800)]
Support GLES acceleration in 64bit emulator on device side

Support both 32bit and 64bit emulator GLES acceleration.

Change-Id: Ibd8b970d23937ae40732324706074ff00f433a14
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
10 years agoam 48a76778: Merge "Remove #include <asm/page.h>."
Elliott Hughes [Tue, 11 Mar 2014 00:52:53 +0000 (00:52 +0000)]
am 48a76778: Merge "Remove #include <asm/page.h>."

* commit '48a76778937abadf5cbd260696a29d737134d0d9':
  Remove #include <asm/page.h>.

10 years agoam 48a76778: Merge "Remove #include <asm/page.h>."
Elliott Hughes [Tue, 25 Feb 2014 00:29:05 +0000 (00:29 +0000)]
am 48a76778: Merge "Remove #include <asm/page.h>."

* commit '48a76778937abadf5cbd260696a29d737134d0d9':
  Remove #include <asm/page.h>.

10 years agoRemove #include <asm/page.h>.
Elliott Hughes [Tue, 25 Feb 2014 00:23:00 +0000 (16:23 -0800)]
Remove #include <asm/page.h>.

Change-Id: I1476efe9a706fe322ec23571c6375b847a0ccf2f

10 years agoam 48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODUL...
Colin Cross [Tue, 28 Jan 2014 00:51:43 +0000 (00:51 +0000)]
am 48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '48107fa1dd354f8667b74f335c3f82f472b7d112':
  device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agodevice/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e

10 years agoam 59922432: Merge commit \'f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD
The Android Open Source Project [Fri, 6 Dec 2013 01:25:09 +0000 (17:25 -0800)]
am 59922432: Merge commit \'f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD

* commit '59922432be859a46eeb76650b24308505625da36':

10 years agoMerge commit 'f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD
The Android Open Source Project [Thu, 5 Dec 2013 20:38:02 +0000 (12:38 -0800)]
Merge commit 'f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD

10 years agoam b9a62053: Merge commit \'828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD
The Android Open Source Project [Sat, 23 Nov 2013 01:31:51 +0000 (17:31 -0800)]
am b9a62053: Merge commit \'828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD

* commit 'b9a62053cf74025a43c8baa118d52729e38cc176':

10 years agoMerge commit '828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 18:34:29 +0000 (10:34 -0800)]
Merge commit '828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD

10 years agoam 2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."
Elliott Hughes [Fri, 22 Nov 2013 01:15:06 +0000 (17:15 -0800)]
am 2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."

* commit '2befc3edc583afb43a4f6740f0af0534eac8e9d5':
  Modify the build targets for goldfish from to include aosp*.

10 years agoModify the build targets for goldfish from to include aosp*.
Raghu Gandham [Fri, 2 Aug 2013 00:21:00 +0000 (17:21 -0700)]
Modify the build targets for goldfish from to include aosp*.

This allows egl.cfg to be copied to $(TARGET_OUT)/lib/egl for aosp*
build targets. This patch fixes the emulator to boot with "-gpu on" flag.

Change-Id: I6c291a4a0fd82242d7f2ac41229be202aa7c71e0

10 years agoam b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"
Jesse Hall [Sat, 9 Nov 2013 23:37:44 +0000 (15:37 -0800)]
am b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"

* commit 'b9a7de1a690bc638496e0550e6a9ebe859fc0315':
  Delete buffer data when removing it from the SharedGroup namespace

10 years agoDelete buffer data when removing it from the SharedGroup namespace
Jesse Hall [Sat, 9 Nov 2013 23:28:21 +0000 (15:28 -0800)]
Delete buffer data when removing it from the SharedGroup namespace

Updating or deleting data associated with a buffer object was clearing
the name->data association, but not actually deallocating the data.

Thanks to manjian2006 for finding the bug and proposing the fix.

Bug: 60468
Change-Id: I477f1e67d33a486419127ac790f32ddbbf566089

11 years agoam 3bd0e079: Merge "Return EGL_FALSE if eglChooseConfig failed to find any matching...
Jesse Hall [Tue, 13 Aug 2013 18:53:59 +0000 (11:53 -0700)]
am 3bd0e079: Merge "Return EGL_FALSE if eglChooseConfig failed to find any matching configs"

* commit '3bd0e079a9d5321f952c2871fb453775810879f7':
  Return EGL_FALSE if eglChooseConfig failed to find any matching configs

11 years agoReturn EGL_FALSE if eglChooseConfig failed to find any matching configs
Martin Storsjo [Sun, 11 Aug 2013 19:05:26 +0000 (22:05 +0300)]
Return EGL_FALSE if eglChooseConfig failed to find any matching configs

Technically, we shouldn't have touched *num_config at all in this
case, but the remote interface to the host doesn't return a separate
boolean return value, only the number of matching configs.

This makes sure that callers that only check the return value of
eglChooseConfig notice a failure to find configs.

Change-Id: I7f660a4a5b8306184608a86c34329d3163ad05ba

11 years agoget rid of HAL pixelformats 5551 and 4444
Mathias Agopian [Fri, 26 Jul 2013 21:49:13 +0000 (14:49 -0700)]
get rid of HAL pixelformats 5551 and 4444

Change-Id: If69c5cdb02dd8308963165a09b5d7fe3b00077ae

11 years agoReconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
The Android Open Source Project [Thu, 6 Jun 2013 17:37:03 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Ie82b1c1ca10b0d4e25b06ec917e23a3703177d5b

11 years agoFlush QemuPipeStream when needed
Petar Jovanovic [Fri, 31 May 2013 16:40:19 +0000 (18:40 +0200)]
Flush QemuPipeStream when needed

Under some circumstances, close color buffer messages in the command stream
do not reach the host as the size of the undelivered commands is small.
This results in refcounts of ColorBuffer never dropping to zero and color
buffers not being freed.

The patch calls flush at the end of rcCloseColorBuffer_enc().
In addition, the stream is flushed before it is deleted in the destructor of
QemuPipeStream, since it may also have important messages.

bug: 9278661

Change-Id: I46f20af8e0c272ec8d831d62f57cb2f22c7b28a7

11 years agoFlush QemuPipeStream when needed
Petar Jovanovic [Fri, 31 May 2013 16:40:19 +0000 (18:40 +0200)]
Flush QemuPipeStream when needed

Under some circumstances, close color buffer messages in the command stream
do not reach the host as the size of the undelivered commands is small.
This results in refcounts of ColorBuffer never dropping to zero and color
buffers not being freed.

The patch calls flush at the end of rcCloseColorBuffer_enc().
In addition, the stream is flushed before it is deleted in the destructor of
QemuPipeStream, since it may also have important messages.

bug: 9278661

Change-Id: I46f20af8e0c272ec8d831d62f57cb2f22c7b28a7

11 years agoGralloc/Camera3: Support new HAL_PIXEL_FORMAT_YCbCr_420_888 format
Eino-Ville Talvala [Sat, 4 May 2013 23:45:22 +0000 (16:45 -0700)]
Gralloc/Camera3: Support new HAL_PIXEL_FORMAT_YCbCr_420_888 format

Enable flexible YUV format buffers from the camera.

 - Add gralloc alloc support for YCbCr_420_888, mapped to NV21
 - Add gralloc lock_ycbcr method
 - Add new format to list supported by camera HAL
 - Fix minor compilation warnings

Bug: 8734880
Change-Id: I68a8cc126985c7d5ae100a87b31c60ee59074cd3

11 years agogoldfish: fix gralloc module
Alex Ray [Fri, 19 Apr 2013 20:59:58 +0000 (13:59 -0700)]
goldfish: fix gralloc module

Explicitly setting reserved (in C++) breaks future extensions of the
module format.  Removed these explicit settings for future
compatibility.

Change-Id: Iaacd5c2f55121bcb8f1761f646ace374eceb2b4f

11 years agoAdd liblog
Ying Wang [Wed, 10 Apr 2013 04:44:20 +0000 (21:44 -0700)]
Add liblog

Bug: 8580410
Change-Id: I2c07b8ce85aff341575ee8c3f509f64e252b8ed4

11 years agomigrate opengl and system from development/tools
keunyoung [Fri, 8 Mar 2013 20:28:03 +0000 (12:28 -0800)]
migrate opengl and system from  development/tools

- components under system are moved one directory up like all other HALs

Change-Id: I03b870b870d83b247ac398cadfb155f03c9adfa0

13 years agoInitial empty repository
Android (Google) Code Review [Fri, 11 Mar 2011 17:14:48 +0000 (09:14 -0800)]
Initial empty repository