Keun-young Park
e3a396b25d
am 906bd042
: Merge "[MIPS] Add MIPS architecture support to libagl"
...
* commit '906bd0422a99b37663a1cb130bf061fdbb3ea189':
[MIPS] Add MIPS architecture support to libagl
2013-03-29 00:12:14 -07:00
Keun-young Park
906bd0422a
Merge "[MIPS] Add MIPS architecture support to libagl"
2013-03-29 06:15:58 +00:00
Keun-young Park
111d920bb5
am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit 'd3b2c029eba356e7bed3754d60ade556c216348e':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:08:17 -07:00
Keun-young Park
d3b2c029eb
Merge "[MIPS] Add MIPS architecture support to opengl framework"
2013-03-29 05:26:28 +00:00
Jesse Hall
4194b3898d
am 0b6c4157
: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
...
* commit '0b6c41571b636cc9b47005fa971db19430cedc09':
frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:21:05 -07:00
Jesse Hall
0b6c41571b
Merge "frameworks/native/opengl: Fix build with gcc 4.8"
2013-03-28 19:28:36 +00:00
Duane Sand
46b4253b76
[MIPS] Add MIPS architecture support to opengl framework
...
Change-Id: Id7704d35bed14d96a85dc1f29db0566cd03872b5
2013-03-28 12:09:36 -07:00
Duane Sand
b43722c3dd
[MIPS] Add MIPS architecture support to libagl
...
Change-Id: I30eb92857a2a6ea867fe0ee45109f17609043aae
2013-03-27 10:53:14 -07:00
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
1cd763f123
am cd91024c
: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
...
* commit 'cd91024ca16db96daa697e22f7a088b416a424e3':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
2013-03-26 11:43:05 -07: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
7212ff29c6
am 20e154f1
: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
...
* commit '20e154f16f315d7ae0b3204db0004d19a8b0bc48':
Second try at adding a compatibility symbol for the MemoryBase constructor.
2013-03-13 22:40:26 -07: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
6250f6cb2b
am d8151306
: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
...
* commit 'd8151306f539f8c2f3b66c1fe06be9566ba8aca3':
Revert "Add a compatibility symbol for the MemoryBase constructor."
2013-03-13 20:32:33 -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
9b57ad737b
am 8facd1b2
: Merge "Add a compatibility symbol for the MemoryBase constructor."
...
* commit '8facd1b2ea02796b575f123b420590d2b8354910':
Add a compatibility symbol for the MemoryBase constructor.
2013-03-13 19:28:17 -07: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
Jean-Baptiste Queru
1d6e52d17e
am 50d36d58
: am 75bcd737
: am 4ddcb758
: (-s ours) am 9ef024ec
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '50d36d58369cdf48bc6fcdba96b36c846be8587a':
2013-03-11 13:13:37 -07:00
Jean-Baptiste Queru
50d36d5836
am 75bcd737
: am 4ddcb758
: (-s ours) am 9ef024ec
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '75bcd737770f85114673c4411b8e2ecc0dd32bdf':
2013-03-11 13:00:44 -07:00
Jean-Baptiste Queru
75bcd73777
am 4ddcb758
: (-s ours) am 9ef024ec
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':
2013-03-11 12:41:50 -07:00
Jean-Baptiste Queru
4ddcb75861
am 9ef024ec
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9ef024ec8ae0318c89cc65dc0591aa40695393fc':
2013-03-11 12:23:09 -07:00
Jean-Baptiste Queru
9ef024ec8a
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:19:30 -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