summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "[MIPS] Add MIPS architecture support to opengl framework"Keun-young Park2013-03-294-1/+116
|\
| * [MIPS] Add MIPS architecture support to opengl frameworkDuane Sand2013-03-284-1/+116
| | | | | | | | Change-Id: Id7704d35bed14d96a85dc1f29db0566cd03872b5
* | Merge "frameworks/native/opengl: Fix build with gcc 4.8"Jesse Hall2013-03-284-4/+4
|\ \ | |/ |/|
| * frameworks/native/opengl: Fix build with gcc 4.8Bernhard Rosenkränzer2013-03-274-4/+4
|/ | | | | | | | | In gcc 4.8, the warning for unused parameters (such as JNIEnv* pointers in JNI functions that don't need it) is enabled by default - causing -Werror to break the build. Change-Id: Ib91721f2cb9912b79c2ac19b4210b1309b08304f Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."Keun-young Park2013-03-261-1/+44
|\
| * [MIPS] Avoid unaligned load/store for 64-bit doubles.Douglas Leung2013-01-171-1/+44
| | | | | | | | | | Change-Id: Iefdcac8742f23fef31f63730b48698fc4205c3ad Signed-off-by: Douglas Leung <douglas@mips.com>
* | Merge "Second try at adding a compatibility symbol for the MemoryBase ↵Elliott Hughes2013-03-141-0/+9
|\ \ | | | | | | | | | constructor."
| * | Second try at adding a compatibility symbol for the MemoryBase constructor.Elliott Hughes2013-03-131-0/+9
|/ / | | | | | | | | | | | | | | | | | | Third-party libraries are currently trying to use the MemoryBase constructor but failing because we fixed the definition of ssize_t. This is a stop-gap for users of this private API until we can get them fixed. Bug: 8253769 Change-Id: Ie7c86f45fa39cb53539cab0ffe8585a585656714
* | Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""Elliott Hughes2013-03-143-15/+3
|\ \
| * | Revert "Add a compatibility symbol for the MemoryBase constructor."Elliott Hughes2013-03-143-15/+3
| | | | | | | | | | | | | | | | | | This reverts commit 7f974ff2f317ffbf9256579109f000ec876c3037 Change-Id: I28ebfc5ac88bd025471b613aa7958d23749e6991
* | | Merge "Add a compatibility symbol for the MemoryBase constructor."Elliott Hughes2013-03-143-3/+15
|\ \ \ | |/ /
| * | Add a compatibility symbol for the MemoryBase constructor.Elliott Hughes2013-03-133-3/+15
|/ / | | | | | | | | | | | | | | | | | | Third-party libraries are currently trying to use the MemoryBase constructor but failing because we fixed the definition of ssize_t. This is a stop-gap for users of this private API until we can get them fixed. Bug: 8253769 Change-Id: I8a19770f3252d88ee87023fde625cc6289924b0d
* | Merge "Ensure dumpstate children die"jp abgrall2013-03-111-0/+4
|\ \
| * | Ensure dumpstate children dieJohn Michelau2013-03-111-0/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Use prctl(PR_SET_PDEATHSIG, SIGKILL) in each forked child to ensure it dies when dumpstate dies. This is important for two cases: - dumpstate runs a timer for each child process. On expiration, it sends SIGTERM to kill the process. Sometimes SIGTERM isn't enough to kill a hung process, so the child lives on. - When dumpstate is killed by the user before completing, outstanding children continue to run and generate output. Change-Id: I96e0dc918c26d56c9fee53611980ba2edd238712
* | Merge "Tweaks for forward compatibility"Jean-Baptiste Queru2013-03-073-0/+91
|\ \
| * | Tweaks for forward compatibilityJean-Baptiste Queru2013-03-063-0/+91
|/ / | | | | | | Change-Id: I136fcbbc14072ee5f5281d09445f28d083ed3ce1
* | Merge "dumpstate: use correct header file."Nick Kralevich2013-03-011-1/+1
|\ \
| * | dumpstate: use correct header file.Nick Kralevich2013-02-281-1/+1
|/ / | | | | | | Change-Id: I006d7a219ce6309259f271beff6011cc266f1a61
* | Merge "Simplify OpenGL TLS access on ARM."Elliott Hughes2013-02-146-65/+3
|\ \
| * | Simplify OpenGL TLS access on ARM.Elliott Hughes2013-02-136-65/+3
|/ / | | | | | | | | | | bionic now assumes the TLS register is available, so OpenGL can too. Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
* | am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"Jesse Hall2013-02-011-1/+4
|\ \ | | | | | | | | | | | | | | | | | | # By luliuhui # Via Gerrit Code Review (1) and Shuo Gao (1) * commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7': Gfx-3d: fix GetProcAddress in egl extention
| * \ Merge "Gfx-3d: fix GetProcAddress in egl extention"Jesse Hall2013-02-011-1/+4
| |\ \ | | |/ | |/|
| | * Gfx-3d: fix GetProcAddress in egl extentionluliuhui2013-01-221-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | This patch can fix issue when Proc address return NULL. Glbench10, egl-ext and conformance test need this patch to run pass. Change-Id: I275c7cb6f77cb334c3ee7fa23cd696bba1c5a458 Author: Liuhui Lu <liuhui.lu@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 52622
* | am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"Jesse Hall2013-01-141-0/+1
|\ \ | |/ | | | | | | * commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235': DisplayDevice: initialize mDisplayToken correctly
| * Merge "DisplayDevice: initialize mDisplayToken correctly"Jesse Hall2013-01-141-0/+1
| |\
| | * DisplayDevice: initialize mDisplayToken correctlyChih-Wei Huang2013-01-071-0/+1
| | | | | | | | | | | | | | | | | | mDisplayToken should be initialized by displayToken. Change-Id: I0a5fec1f1732200a32d10b1575239dceffe6dee4
* | | am cbe51356: Merge "Remove support for legacy HWC version encoding"Jesse Hall2013-01-141-11/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'cbe5135610cd3c919e6334fada72cc52238bb8b0': Remove support for legacy HWC version encoding
| * | Merge "Remove support for legacy HWC version encoding"Jesse Hall2013-01-141-11/+1
| |\ \ | | |/ | |/|
| | * Remove support for legacy HWC version encodingJesse Hall2013-01-101-11/+1
| |/ | | | | | | Change-Id: If03ae1ebf10d15777310e1449a57473021390582
* | am fdd8551f: Merge "Fix build"Andrew Hsieh2012-12-161-1/+4
|\ \ | |/ | | | | | | * commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28': Fix build
| * Merge "Fix build"Andrew Hsieh2012-12-161-1/+4
| |\
| | * Fix buildAndrew Hsieh2012-12-171-1/+4
| |/ | | | | | | Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
* | am acfcd62a: Merge "Revert "Fix typo""Andrew Hsieh2012-12-151-1/+1
|\ \ | |/ | | | | | | * commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35': Revert "Fix typo"
| * Merge "Revert "Fix typo""Andrew Hsieh2012-12-151-1/+1
| |\
| | * Revert "Fix typo"Andrew Hsieh2012-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c118edfc1ab9a608537ebc2f2ec936216f15a36c Need to go together with https://android-review.googlesource.com/#/c/48117/ Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
* | | am 670c570e: Merge "Fix typo"Andrew Hsieh2012-12-151-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '670c570e75e399432e96c9fd1dfa3fb92869f10c': Fix typo
| * | Merge "Fix typo"Andrew Hsieh2012-12-151-1/+1
| |\ \ | | |/
| | * Fix typoAndrew Hsieh2012-12-161-1/+1
| |/ | | | | | | | | | | Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
* | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-110-0/+0
|\ \ | | | | | | | | | Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00
| * \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-100-0/+0
| |\ \
* | \ \ am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc ↵Jamie Gennis2012-12-101-52/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for async frees * commit '6426bd62676c743b0b5bdc397bcab5c669c6e51f': [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
| * \ \ \ am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async freesJamie Gennis2012-12-101-52/+108
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f53f9c6d3668490f6c68f5c094c28f645c1b3da3': [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
| | * | | [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async freesJamie Gennis2012-12-101-52/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes GraphicBufferAllocator::alloc wait for pending async frees to complete before attempting to allocate a gralloc buffer if there are more than 8 pending async frees. Bug: 7696861 Change-Id: I1fae86e13edefcaa153b8ce9fd057f335716059e
* | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-100-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c
| * | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-070-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'd4e706208c99ff1716fb0009ec867ff29ff04a7c': Revert "ConsumerBase: free buffers outside the lock"
| * | | | am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae': Revert "ConsumerBase: free buffers outside the lock"
| | * | | Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| | | | | | | | | | | | | | | | | | | | This reverts commit b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.
* | | | | am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-072-11/+56
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '2d659286b59dc7ff7378fe967f1c425e92155995': DO NOT MERGE GraphicBufferAllocator: make frees async
| * | | | am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-072-11/+56
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887': DO NOT MERGE GraphicBufferAllocator: make frees async
generated by cgit v1.1 at 2025-04-02 04:24:44 +0000