OSDN Git Service
Mathias Agopian [Fri, 12 Apr 2013 03:18:17 +0000 (03:18 +0000)]
Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
Mathias Agopian [Thu, 11 Apr 2013 05:55:41 +0000 (22:55 -0700)]
Improve screenshot performance on some devices (DO NOT MERGE)
this affects devices that need a glReadPixels(). We use
a FBO instead of a GlConsumer as an intermediate render target, this
saves 2 calls to eglMakeCurrent().
On Galaxy Nexus this allows us to go from ~135ms to ~35ms for
recent's screenshots.
Bug:
8582615
Change-Id: I6b25291ecc235f1927579bbb2db3c731e985c6e8
Chet Haase [Thu, 11 Apr 2013 22:24:55 +0000 (15:24 -0700)]
DO NOT MERGE Make sure surfaces always have latest orientation info
When the screen is turned off, the current stack is set to -1. This causes
logic in iSurfaceFlinger's handleTransactionLocked() function to fail to
match the current stack, and the latest orientation is not set into the
layer. This causes BufferQueue, later, to potentially set an obsolete
transformHint on a created surface (such as in the case with ImageWallpaper's
Egl surface, in the bug below).
The fix is to note this situation and use a default value for the DisplayDevice,
which should have the current orientation information.
Issue #
8508397 ImageWallpaper sometimes rendered in wrong orientation causing a ~30-40% drop in graphics performance
Change-Id: Ibae15d73b289a8343c67f4f6bb77fdf11dd95ee7
Rom Lemarchand [Wed, 10 Apr 2013 23:59:36 +0000 (16:59 -0700)]
Add support for OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m color format
Change-Id: I9392eb961ec92d4d778573b7a142344e552c80d6
Andy McFadden [Thu, 11 Apr 2013 17:23:27 +0000 (10:23 -0700)]
am
12ff91b0: am
53dc9044: Merge "Updated comments" into jb-mr2-dev
* commit '
12ff91b05a055e6adffaad9bf7661a5d251c5b6c':
Updated comments
Andy McFadden [Thu, 11 Apr 2013 17:20:26 +0000 (10:20 -0700)]
am
53dc9044: Merge "Updated comments" into jb-mr2-dev
* commit '
53dc9044bfe17039592faf4660c5bf715e8120ad':
Updated comments
Andy McFadden [Thu, 11 Apr 2013 17:15:52 +0000 (17:15 +0000)]
Merge "Updated comments" into jb-mr2-dev
The Android Automerger [Thu, 11 Apr 2013 16:22:40 +0000 (09:22 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Thu, 11 Apr 2013 14:47:08 +0000 (07:47 -0700)]
am
6a92b35e: Reconcile with jb-mr2-release - do not merge
* commit '
6a92b35e3a64c90127fb87530c50e9a04a61c671':
The Android Open Source Project [Thu, 11 Apr 2013 14:45:13 +0000 (07:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If9501b8a4f0e4a1d6dc787c71457814360d11d2b
The Android Automerger [Thu, 11 Apr 2013 12:55:37 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Thu, 11 Apr 2013 04:49:55 +0000 (21:49 -0700)]
Special-case glGetActiveUniformBlockName
Bug:
8566953
Change-Id: Ic9b3be9fa0136495633ee3b1c38583cfa315942a
Jesse Hall [Wed, 10 Apr 2013 23:27:00 +0000 (16:27 -0700)]
Special-case glGetStringi
Modeled on the existing glGetString special-case.
Bug:
8566953
Change-Id: Icc6b23ab53b00510368900ad99c92028253dc797
Jesse Hall [Wed, 10 Apr 2013 23:13:35 +0000 (16:13 -0700)]
Special-case glMapBufferRange
Updating the generator to handle GLvoid*/java.nio.Buffer return values
probably wouldn't be too hard, but this is the only function that
needs it currently.
Bug:
8566953
Change-Id: I359a951136ab479ab576ce2e5a2881b937b7e8c9
Jesse Hall [Wed, 10 Apr 2013 22:48:58 +0000 (15:48 -0700)]
Special-case glGetBufferPointerv
Bug:
8566953
Change-Id: I11a7394eb46f229fd3ae716e77487a45bac6ed53
Jesse Hall [Wed, 10 Apr 2013 16:26:48 +0000 (09:26 -0700)]
Special-case glGetUniformIndices
Bug:
8566953
Change-Id: Ic8bcd03e8d41a81f48d603f67ce2046a4afa1561
Jesse Hall [Wed, 10 Apr 2013 07:50:32 +0000 (00:50 -0700)]
Special-case glGetTransformFeedbackVarying
Just a search-and-replace on the glGetActiveAttrib special-case, since
they have the same signature and parameter handling.
Bug:
8566953
Change-Id: I40834d6f32bf9ecb39718df29036aa2d1bbfa07a
Jesse Hall [Wed, 10 Apr 2013 07:34:07 +0000 (00:34 -0700)]
Special-case glTransformFeedbackVaryings
Bug:
8566953
Change-Id: I02a1548aebc12bd3599903029bfd2e4ccea53211
Jesse Hall [Wed, 10 Apr 2013 08:17:34 +0000 (01:17 -0700)]
Add buffer object versions of several functions
Some of these are new ES3 functions, some are existing ES2 functions
that can now use the new pixel pack/unpack buffer bindings.
glDrawElementsInstanced needs a special case since the pointer/offset
arg isn't the last one like the generator assumes.
Bug:
8566953
Change-Id: I638a36b0a31aefcb5bfee6f4d049348223045103
Jesse Hall [Wed, 10 Apr 2013 08:01:00 +0000 (01:01 -0700)]
Add *int64 and GLsync types and related functions
Return values are declared with the C return type, but the JNI
function returns the JNI return type. In the case of GLsync/jlong as
in glFenceSync(), this causes a compile error. So the generator now
explicitly casts the return value to the JNI return type.
Bug:
8566953
Change-Id: I814befe2e4cce745434cbc4e1c8639fc3ce8aeae
Jesse Hall [Fri, 29 Mar 2013 20:06:32 +0000 (13:06 -0700)]
Add ES3 functions and constants, difficult ones commented out
This change adds ES3 functions to GLES30.spec, disabling any that
require non-trivial changes for the generator to handle.
Steps taken to add these:
- Copy ES3 function declarations from gl3.h
- Remove GL_APICALL, GL_APIENTRY, and semicolon from each declaration
- Add whitespace around parens and *s as required by the parser
- Comment out functions that the generator doesn't understand or that
it generates bad Java interfaces for (by inspection).
Bug:
8566953
Change-Id: Iaaef7d53e24f9a576759dbba72cd206bae1c1276
Mathias Agopian [Thu, 11 Apr 2013 04:49:51 +0000 (21:49 -0700)]
am
f30501e1: am
d19e519f: Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
* commit '
f30501e1e280e8b5637430ac2be79235ee16d018':
fix another bug where screenshots could end-up all black
Mathias Agopian [Thu, 11 Apr 2013 04:46:12 +0000 (21:46 -0700)]
am
d19e519f: Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
* commit '
d19e519f673adcc5d12fcca549e577eea74f31aa':
fix another bug where screenshots could end-up all black
Mathias Agopian [Thu, 11 Apr 2013 04:43:48 +0000 (04:43 +0000)]
Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
Mathias Agopian [Wed, 10 Apr 2013 23:27:17 +0000 (16:27 -0700)]
fix another bug where screenshots could end-up all black
SF transactions were always handled on VSYNC which allowed
the screenshot to sneak-in between closing the transaction
and vsync (before it's latched), resulting in a screenshot
with the previous state.
we now always force transactions to happen immediately
before screenhots.
Bug:
7552304
Change-Id: I0afc86b7e8366173daff5b9988bbb4d2a0f43860
The Android Open Source Project [Wed, 10 Apr 2013 17:08:24 +0000 (10:08 -0700)]
am
e1b8a7fc: Reconcile with jb-mr2-release - do not merge
* commit '
e1b8a7fcee9a193bf01f0842b0aca35b27bf0c16':
The Android Open Source Project [Wed, 10 Apr 2013 17:05:42 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I968ec2bb02006948c3f24c449d2a79a0e2f799f9
Jesse Hall [Fri, 29 Mar 2013 17:49:58 +0000 (10:49 -0700)]
Make gen more readable, use UNIX-style line endings
Change-Id: I6f4a1afa19f84d89278e9447f14a124476106fef
Jesse Hall [Fri, 29 Mar 2013 22:20:45 +0000 (15:20 -0700)]
Support "const GLChar*" and "const GLenum*" types
Bug:
8566953
Change-Id: I349575e592e8b0d93d14237230b69bec4e04cf3e
Jesse Hall [Fri, 29 Mar 2013 22:21:09 +0000 (15:21 -0700)]
Minor changes to ES3 functions inherited from ES2
With the addition of float framebuffer support in ES3, some parameters
to ES2 functions are now GLfloat instead of GLclampf. Both are
typedefs for 'float', so this is a source and binary compatible change.
Bug:
8566953
Change-Id: I0b5acc78da7799a04053fdb568205f793792cad9
Jesse Hall [Fri, 29 Mar 2013 18:02:07 +0000 (11:02 -0700)]
Generate GLES30 class, just a clone of GLES20 for now
Bug:
8566953
Change-Id: I6fad880344b9c247de4018711ea7cb6eb1a609d6
The Android Automerger [Wed, 10 Apr 2013 14:50:16 +0000 (07:50 -0700)]
merge in master-release history after reset to master
The Android Automerger [Wed, 10 Apr 2013 12:56:11 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:33:16 +0000 (22:33 -0700)]
am
46f19772: resolved conflicts for merge of
c76e8a20 to jb-mr2-dev-plus-aosp
* commit '
46f19772ae5659c1659a0ac8f1f72389e94a85d4':
Add liblog
Ying Wang [Wed, 10 Apr 2013 05:27:50 +0000 (22:27 -0700)]
resolved conflicts for merge of
c76e8a20 to jb-mr2-dev-plus-aosp
Change-Id: I895a8ad8c936a80c70aaac739c6441d3c7c55834
Ying Wang [Wed, 10 Apr 2013 05:17:07 +0000 (05:17 +0000)]
Merge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 04:55:39 +0000 (21:55 -0700)]
Add liblog
Bug:
8580410
Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
Jamie Gennis [Tue, 9 Apr 2013 21:49:54 +0000 (14:49 -0700)]
am
13c9a949: am
8758a3e3: Merge changes I82e361a6,I83694682 into jb-mr2-dev
* commit '
13c9a949b5d74f36edbdbfda764fe554cdbaefa9':
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
Jamie Gennis [Tue, 9 Apr 2013 21:46:21 +0000 (14:46 -0700)]
am
8758a3e3: Merge changes I82e361a6,I83694682 into jb-mr2-dev
* commit '
8758a3e3941bae9ef11948506950521c4682acf1':
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
Jamie Gennis [Tue, 9 Apr 2013 21:43:20 +0000 (21:43 +0000)]
Merge changes I82e361a6,I83694682 into jb-mr2-dev
* changes:
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
Jamie Gennis [Sat, 6 Apr 2013 00:37:32 +0000 (17:37 -0700)]
libgui_test: increase the tolerance for a YUV test
This change increases the pixel difference tolerance of the
SurfaceTextureGLTest.TexturingFromCpuFilledYV12BufferNpot test from 2 to 3.
Bug:
8349135
Change-Id: I82e361a689335f49065cacd8a3fc145d67b125f1
Jamie Gennis [Fri, 5 Apr 2013 23:41:27 +0000 (16:41 -0700)]
libgui: fix an EGLImage leak
This moves the call to ConsumerBase::abandon from the ConsumerBase dtor to
ConsumerBase::onLastStrongRef. The abandon call relies on virtual methods to
perform the clean-up, so calling it from the ConsumerBase dtor after the
derived classes dtors ran was skipping some of the clean-up. The
onLastStrongRef method should get called just before the most derived class's
dtor gets called.
Bug:
8349135
Change-Id: I836946826927cc1ed69c049049f525f92b17a269
The Android Open Source Project [Mon, 8 Apr 2013 20:40:32 +0000 (13:40 -0700)]
am
ecef1c1a: Reconcile with jb-mr2-release - do not merge
* commit '
ecef1c1a31619782737230b5fd45718f20760ca9':
The Android Open Source Project [Mon, 8 Apr 2013 20:36:03 +0000 (13:36 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2e2b858b5fee36a390f92f657a171d2898ae9810
The Android Automerger [Mon, 8 Apr 2013 14:50:29 +0000 (07:50 -0700)]
merge in master-release history after reset to master
The Android Automerger [Mon, 8 Apr 2013 12:56:23 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Sat, 6 Apr 2013 03:40:22 +0000 (20:40 -0700)]
am
ff080169: am
1df59c93: Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
* commit '
ff08016919e2c0508501faede26fda6dca833094':
Tell HWComposer the dimensions of virtual displays
Jesse Hall [Sat, 6 Apr 2013 03:40:21 +0000 (20:40 -0700)]
am
46ab373f: am
d5e345b0: Merge "Actually set the virtual display output buffer." into jb-mr2-dev
* commit '
46ab373f1f394ec50e38381cb98d3976fe87a9bb':
Actually set the virtual display output buffer.
Jesse Hall [Sat, 6 Apr 2013 03:37:13 +0000 (20:37 -0700)]
am
1df59c93: Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
* commit '
1df59c93fea8bec21b8084c34aface086f1e0896':
Tell HWComposer the dimensions of virtual displays
Jesse Hall [Sat, 6 Apr 2013 03:37:13 +0000 (20:37 -0700)]
am
d5e345b0: Merge "Actually set the virtual display output buffer." into jb-mr2-dev
* commit '
d5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37':
Actually set the virtual display output buffer.
Jesse Hall [Sat, 6 Apr 2013 03:32:19 +0000 (03:32 +0000)]
Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
Jesse Hall [Sat, 6 Apr 2013 03:31:49 +0000 (03:31 +0000)]
Merge "Actually set the virtual display output buffer." into jb-mr2-dev
Jesse Hall [Fri, 5 Apr 2013 20:44:52 +0000 (13:44 -0700)]
Tell HWComposer the dimensions of virtual displays
HWComposer queries the HWC for dimensions of physical displays, but
can't do that for virtual displays. The dimensions are used to set the
display frame of the framebuffer target layer passed to HWC, and
implicitly the dimensions of the virtual display.
Bug:
8316155
Change-Id: I9cbd2530d2fa878f86128a1472def520b5d694a5
Andy McFadden [Fri, 5 Apr 2013 00:09:03 +0000 (17:09 -0700)]
Updated comments
Updated many comments. Added one minor error check.
Change-Id: Ib935dd99d417bada91d2e198008a50dd94269316
The Android Automerger [Fri, 5 Apr 2013 14:49:39 +0000 (07:49 -0700)]
merge in master-release history after reset to master
Geremy Condra [Fri, 5 Apr 2013 06:46:51 +0000 (23:46 -0700)]
am
e167d889: am
a3d3e137: Merge "dumpstate: Add SELinux restorecon call."
* commit '
e167d889e4917e6b4f569026a1492b9e9818b08e':
dumpstate: Add SELinux restorecon call.
Geremy Condra [Fri, 5 Apr 2013 06:42:15 +0000 (23:42 -0700)]
am
a3d3e137: Merge "dumpstate: Add SELinux restorecon call."
* commit '
a3d3e137f473a965fefced9670e3b0c6b5f7f791':
dumpstate: Add SELinux restorecon call.
Mathias Agopian [Fri, 5 Apr 2013 06:35:37 +0000 (23:35 -0700)]
am
dff2f699: am
39c24a20: fix local include paths
* commit '
dff2f699e16635c44472b0e4f2a3176e4f061367':
fix local include paths
Mathias Agopian [Fri, 5 Apr 2013 06:34:04 +0000 (23:34 -0700)]
am
39c24a20: fix local include paths
* commit '
39c24a20bbc697630d2b92c251b70c04d6f9d00c':
fix local include paths
Mathias Agopian [Fri, 5 Apr 2013 06:17:56 +0000 (23:17 -0700)]
fix local include paths
Change-Id: Icb921fa796ec08612dbb2feb7e7161bcb0cf4a99
Jeff Tinker [Fri, 5 Apr 2013 01:22:51 +0000 (18:22 -0700)]
am
c809d2c7: am
18bd1d6d: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '
c809d2c7219958bcb38b34060498f94d7812eb36':
Implement async event callout from drm plugin to Java app
Jeff Tinker [Fri, 5 Apr 2013 01:19:32 +0000 (18:19 -0700)]
am
18bd1d6d: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '
18bd1d6d55a275d23188251169dfe3cc74882665':
Implement async event callout from drm plugin to Java app
Jeff Tinker [Fri, 5 Apr 2013 01:16:21 +0000 (01:16 +0000)]
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
Geremy Condra [Thu, 4 Apr 2013 23:38:13 +0000 (23:38 +0000)]
Merge "dumpstate: Add SELinux restorecon call."
Jesse Hall [Thu, 4 Apr 2013 22:43:23 +0000 (15:43 -0700)]
am
8123a227: am
6d5b8e60: Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
* commit '
8123a2270d5893f9357ec18f9af4f3258406e468':
Clean up HWC state when releasing a DisplayDevice
Jesse Hall [Thu, 4 Apr 2013 22:40:02 +0000 (15:40 -0700)]
am
6d5b8e60: Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
* commit '
6d5b8e600e77164d3b5e51b89bf9c940fd7b4ea2':
Clean up HWC state when releasing a DisplayDevice
Jesse Hall [Thu, 4 Apr 2013 22:36:10 +0000 (22:36 +0000)]
Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
Jesse Hall [Thu, 4 Apr 2013 19:59:37 +0000 (12:59 -0700)]
Actually set the virtual display output buffer.
Bug:
8316155
Change-Id: Ida1ac47e5a932fdaad3ec862e121cfe55d255699
The Android Automerger [Thu, 4 Apr 2013 14:49:53 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Thu, 4 Apr 2013 12:55:39 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Robert Craig [Thu, 4 Apr 2013 10:33:10 +0000 (06:33 -0400)]
dumpstate: Add SELinux restorecon call.
Set the security context on the directory used
to dump Dalvik and native stack traces.
Change-Id: Iba13783f10e850485ce1a8d4aa5792d55085eb22
Signed-off-by: Robert Craig <rpcraig@tycho.ncsc.mil>
Mathias Agopian [Thu, 4 Apr 2013 01:05:45 +0000 (18:05 -0700)]
am
a22f783b: am
2ca79399: latch transparent region hint only when we get a new frame
* commit '
a22f783b141a9da1950f8426bbf87535495856eb':
latch transparent region hint only when we get a new frame
The Android Open Source Project [Thu, 4 Apr 2013 01:05:28 +0000 (18:05 -0700)]
am
5adde8db: Reconcile with jb-mr2-release - do not merge
* commit '
5adde8dbb826f0e15db4c9a64768a693245a7ee5':
Mathias Agopian [Thu, 4 Apr 2013 00:33:16 +0000 (17:33 -0700)]
am
2ca79399: latch transparent region hint only when we get a new frame
* commit '
2ca79399b933935eb1b6c0ec1f746f8c4475369c':
latch transparent region hint only when we get a new frame
The Android Open Source Project [Wed, 3 Apr 2013 23:43:27 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ib4728c3dd9e0c91c67a086ca229831495d5fef4c
Jeff Tinker [Tue, 2 Apr 2013 20:16:21 +0000 (13:16 -0700)]
Implement async event callout from drm plugin to Java app
Change-Id: I83a7757a7b83676ce1a9ffa6ff0a8e495e31b859
The Android Automerger [Wed, 3 Apr 2013 14:49:48 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Wed, 3 Apr 2013 13:02:33 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Wed, 3 Apr 2013 01:30:32 +0000 (18:30 -0700)]
latch transparent region hint only when we get a new frame
since the transparent region hint really depends on the
content of the window containing the SurfaceView
(it's calculated by the view hierarchy based on
overlapping views), it makes sense to latch it only when
the content of the window (the app) changes.
This should help fixing drawing artifacts when changing the
layout of a window containing a SurfaceView.
Bug:
8511430
Change-Id: Ic3aa668495293cb4d82a2cd7dcf3b6a337287678
Mathias Agopian [Tue, 2 Apr 2013 23:45:16 +0000 (16:45 -0700)]
am
b7648000: am
128fcea1: Merge "Fix include paths" into jb-mr2-dev
* commit '
b7648000c387437f8e86188688f578f280540c8a':
Fix include paths
Jeff Tinker [Tue, 2 Apr 2013 23:45:15 +0000 (16:45 -0700)]
am
f71fb8dd: am
263e8cb2: Merge "MediaDrm API update" into jb-mr2-dev
* commit '
f71fb8ddcfb0cf132ac42a0e30cbdb7931ede19b':
MediaDrm API update
Mathias Agopian [Tue, 2 Apr 2013 23:40:45 +0000 (16:40 -0700)]
am
128fcea1: Merge "Fix include paths" into jb-mr2-dev
* commit '
128fcea1c6f8b5f66a5d88a80789e65aac798416':
Fix include paths
Jeff Tinker [Tue, 2 Apr 2013 23:40:44 +0000 (16:40 -0700)]
am
263e8cb2: Merge "MediaDrm API update" into jb-mr2-dev
* commit '
263e8cb29ce9b3c02dd417b9ee57d6d64d895e7f':
MediaDrm API update
Mathias Agopian [Tue, 2 Apr 2013 23:20:15 +0000 (23:20 +0000)]
Merge "Fix include paths" into jb-mr2-dev
Jeff Tinker [Tue, 2 Apr 2013 22:49:23 +0000 (22:49 +0000)]
Merge "MediaDrm API update" into jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 18:04:14 +0000 (11:04 -0700)]
am
d92f9427: Reconcile with jb-mr2-release - do not merge
* commit '
d92f942712dad500296525e9124b94554ed5f6ff':
Jamie Gennis [Tue, 2 Apr 2013 18:03:50 +0000 (11:03 -0700)]
am
6f28cebf: am
83a3ad4d: Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
* commit '
6f28cebf7afac1a16d1427989a7a31c0868e1348':
EGL_ANDROID_presentation_time: initial spec draft
The Android Automerger [Tue, 2 Apr 2013 16:18:52 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:36 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I84ec0a95b1f215197352bf76b467325d5687ff62
Jamie Gennis [Tue, 2 Apr 2013 15:24:08 +0000 (08:24 -0700)]
am
83a3ad4d: Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
* commit '
83a3ad4d579b514dfeff43008254d05922e5e324':
EGL_ANDROID_presentation_time: initial spec draft
Jeff Tinker [Sat, 30 Mar 2013 23:28:20 +0000 (16:28 -0700)]
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I418ffbb37e3036a2b5eea5a86ac88a5af1a9da07
Mathias Agopian [Mon, 1 Apr 2013 23:54:58 +0000 (16:54 -0700)]
Fix include paths
Change-Id: If5350a3de995cc0cb1afea067e7ce168bc00d3f5
Jamie Gennis [Mon, 1 Apr 2013 23:27:38 +0000 (23:27 +0000)]
Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
Jamie Gennis [Wed, 9 Jan 2013 02:07:17 +0000 (18:07 -0800)]
EGL_ANDROID_presentation_time: initial spec draft
Change-Id: I1cd174a08c499e5bde19e7ecd449da8266e7e66e
The Android Automerger [Mon, 1 Apr 2013 18:50:54 +0000 (11:50 -0700)]
merge in master-release history after reset to master
The Android Automerger [Mon, 1 Apr 2013 12:55:50 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Sun, 31 Mar 2013 06:32:30 +0000 (23:32 -0700)]
am
1d923a08: am
441f6946: Fix MIPS assembly variable names to not conflict with GL API parameter names
* commit '
1d923a085379a757dcf470f151b605e82f608130':
Fix MIPS assembly variable names to not conflict with GL API parameter names
Jesse Hall [Sun, 31 Mar 2013 06:30:24 +0000 (23:30 -0700)]
am
441f6946: Fix MIPS assembly variable names to not conflict with GL API parameter names
* commit '
441f69463ec595ad42fdaad1bbfbb0f7a932437c':
Fix MIPS assembly variable names to not conflict with GL API parameter names
Jesse Hall [Sun, 31 Mar 2013 06:22:19 +0000 (23:22 -0700)]
Fix MIPS assembly variable names to not conflict with GL API parameter names
Change-Id: I8e93fb55018de53a596cb176d48dbfdf1fd396e4
Mathias Agopian [Fri, 29 Mar 2013 23:39:45 +0000 (16:39 -0700)]
am
46c21a6d: am
86e392e9: Merge "don\'t use compile-time configuration of libgui as much as possible" into jb-mr2-dev
* commit '
46c21a6d89286abe9fae6f39db9da138dcfee0a8':
don't use compile-time configuration of libgui as much as possible
OSDN Git Service
