Bernhard Rosenkränzer
c80fae6e85
frameworks/native/opengl: Fix build with gcc 4.8
...
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>
2013-03-27 14:06:39 +01:00
Keun-young Park
cd91024ca1
Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
2013-03-26 17:47:19 +00:00
Elliott Hughes
20e154f16f
Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
2013-03-14 04:35:13 +00:00
Elliott Hughes
ddd286301b
Second try at adding a compatibility symbol for the MemoryBase constructor.
...
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
2013-03-13 20:54:01 -07:00
Elliott Hughes
d8151306f5
Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
2013-03-14 02:56:48 +00:00
Elliott Hughes
6dbf07d7d5
Revert "Add a compatibility symbol for the MemoryBase constructor."
...
This reverts commit 7f974ff2f3
Change-Id: I28ebfc5ac88bd025471b613aa7958d23749e6991
2013-03-14 02:56:34 +00:00
Elliott Hughes
8facd1b2ea
Merge "Add a compatibility symbol for the MemoryBase constructor."
2013-03-14 01:19:44 +00:00
Elliott Hughes
7f974ff2f3
Add a compatibility symbol for the MemoryBase constructor.
...
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
2013-03-13 18:19:20 -07:00
jp abgrall
ba8abb517d
Merge "Ensure dumpstate children die"
2013-03-11 18:09:35 +00:00
John Michelau
e7b6cf13f9
Ensure dumpstate children die
...
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
2013-03-11 11:44:15 -05:00
Jean-Baptiste Queru
bfb2aa4652
Merge "Tweaks for forward compatibility"
2013-03-07 19:08:08 +00:00
Jean-Baptiste Queru
d82bea798e
Tweaks for forward compatibility
...
Change-Id: I136fcbbc14072ee5f5281d09445f28d083ed3ce1
2013-03-06 15:26:54 -08:00
Nick Kralevich
22641851c4
Merge "dumpstate: use correct header file."
2013-03-01 16:39:58 +00:00
Nick Kralevich
e96b2d0037
dumpstate: use correct header file.
...
Change-Id: I006d7a219ce6309259f271beff6011cc266f1a61
2013-02-28 16:46:22 -08:00
Elliott Hughes
45b0e4350d
Merge "Simplify OpenGL TLS access on ARM."
2013-02-14 18:31:20 +00:00
Elliott Hughes
288870ebc3
Simplify OpenGL TLS access on ARM.
...
bionic now assumes the TLS register is available, so OpenGL can too.
Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
2013-02-13 17:30:54 -08:00
Jesse Hall
873ab60e94
am 75b83e4d
: Merge "Gfx-3d: fix GetProcAddress in egl extention"
...
# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
Gfx-3d: fix GetProcAddress in egl extention
2013-02-01 12:37:25 -08:00
Jesse Hall
75b83e4dc7
Merge "Gfx-3d: fix GetProcAddress in egl extention"
2013-02-01 19:33:16 +00:00
luliuhui
69d100762c
Gfx-3d: fix GetProcAddress in egl extention
...
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
2013-01-22 15:14:34 +08:00
Douglas Leung
cc1a4bb1e1
[MIPS] Avoid unaligned load/store for 64-bit doubles.
...
Change-Id: Iefdcac8742f23fef31f63730b48698fc4205c3ad
Signed-off-by: Douglas Leung <douglas@mips.com>
2013-01-17 13:03:43 -08:00
Jesse Hall
fc866eb842
am 845ed8fd
: Merge "DisplayDevice: initialize mDisplayToken correctly"
...
* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
DisplayDevice: initialize mDisplayToken correctly
2013-01-14 14:34:15 -08:00
Jesse Hall
845ed8fdaa
Merge "DisplayDevice: initialize mDisplayToken correctly"
2013-01-14 13:53:09 -08:00
Jesse Hall
f3e9d5bde5
am cbe51356
: Merge "Remove support for legacy HWC version encoding"
...
* commit 'cbe5135610cd3c919e6334fada72cc52238bb8b0':
Remove support for legacy HWC version encoding
2013-01-14 09:47:49 -08:00
Jesse Hall
cbe5135610
Merge "Remove support for legacy HWC version encoding"
2013-01-14 09:25:21 -08:00
Jesse Hall
7296051995
Remove support for legacy HWC version encoding
...
Change-Id: If03ae1ebf10d15777310e1449a57473021390582
2013-01-10 18:17:13 -08:00
Chih-Wei Huang
27e2562868
DisplayDevice: initialize mDisplayToken correctly
...
mDisplayToken should be initialized by displayToken.
Change-Id: I0a5fec1f1732200a32d10b1575239dceffe6dee4
2013-01-07 17:36:19 +08:00
Andrew Hsieh
8d9f011892
am fdd8551f
: Merge "Fix build"
...
* commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28':
Fix build
2012-12-16 16:35:31 -08:00
Andrew Hsieh
fdd8551fe8
Merge "Fix build"
2012-12-16 16:03:03 -08:00
Andrew Hsieh
370980c528
Fix build
...
Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
2012-12-17 08:01:36 +08:00
Andrew Hsieh
d8f2daada3
am acfcd62a
: Merge "Revert "Fix typo""
...
* commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
Revert "Fix typo"
2012-12-15 21:23:12 -08:00
Andrew Hsieh
4bb20303d9
am 670c570e
: Merge "Fix typo"
...
* commit '670c570e75e399432e96c9fd1dfa3fb92869f10c':
Fix typo
2012-12-15 21:23:12 -08:00
Andrew Hsieh
acfcd62aa9
Merge "Revert "Fix typo""
2012-12-15 20:32:27 -08:00
Andrew Hsieh
c7d5fa98b5
Revert "Fix typo"
...
This reverts commit c118edfc1a
Need to go together with https://android-review.googlesource.com/#/c/48117/
Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
2012-12-15 20:31:56 -08:00
Andrew Hsieh
670c570e75
Merge "Fix typo"
2012-12-15 20:30:31 -08:00
Andrew Hsieh
c118edfc1a
Fix typo
...
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS
Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
2012-12-16 11:20:34 +08:00
The Android Open Source Project
0c6fff72f7
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00
2012-12-11 11:54:26 -08:00
The Android Automerger
529cb9ed9c
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-10 19:33:41 -08:00
Jamie Gennis
884e3bc29e
am 6426bd62
: am f53f9c6d
: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
...
* commit '6426bd62676c743b0b5bdc397bcab5c669c6e51f':
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
2012-12-10 17:58:33 -08:00
Jamie Gennis
6426bd6267
am f53f9c6d
: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
...
* commit 'f53f9c6d3668490f6c68f5c094c28f645c1b3da3':
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
2012-12-10 17:57:40 -08:00
Jamie Gennis
f53f9c6d36
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
...
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
2012-12-10 17:19:37 -08:00
The Android Open Source Project
064d252918
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c
2012-12-10 15:19:43 -08:00
The Android Automerger
4f9fb2ba97
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-07 13:26:18 -08:00
Jamie Gennis
50f8d2856b
am d4e70620
: am 72c3f7d8
: Revert "ConsumerBase: free buffers outside the lock"
...
* commit 'd4e706208c99ff1716fb0009ec867ff29ff04a7c':
Revert "ConsumerBase: free buffers outside the lock"
2012-12-07 11:07:03 -08:00
Jamie Gennis
d4e706208c
am 72c3f7d8
: Revert "ConsumerBase: free buffers outside the lock"
...
* commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
Revert "ConsumerBase: free buffers outside the lock"
2012-12-07 11:04:51 -08:00
Jamie Gennis
7df16644c4
am 2d659286
: am 2e59d2c3
: DO NOT MERGE GraphicBufferAllocator: make frees async
...
* commit '2d659286b59dc7ff7378fe967f1c425e92155995':
DO NOT MERGE GraphicBufferAllocator: make frees async
2012-12-07 10:59:29 -08:00
Jamie Gennis
2d659286b5
am 2e59d2c3
: DO NOT MERGE GraphicBufferAllocator: make frees async
...
* commit '2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887':
DO NOT MERGE GraphicBufferAllocator: make frees async
2012-12-07 10:58:22 -08:00
Jamie Gennis
72c3f7d881
Revert "ConsumerBase: free buffers outside the lock"
...
This reverts commit b21a4e3b5f
.
2012-12-07 10:33:07 -08:00
Jamie Gennis
2e59d2c3fd
DO NOT MERGE GraphicBufferAllocator: make frees async
...
This change makes GraphicBufferAllocator::free queue a job to another thread to
perform the actual free operation. This prevents potentially slow free
operations from blocking rendering.
Bug: 7675940
Change-Id: Id61099d66bb4c3949d04184e0d7f192ac18076b4
2012-12-07 10:32:13 -08:00
The Android Open Source Project
7bd5a76e2e
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af
2012-12-07 07:53:15 -08:00
The Android Automerger
2fef5c45e7
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-12-06 19:36:11 -08:00