OSDN Git Service
Marco Nelissen [Mon, 6 May 2013 18:11:38 +0000 (11:11 -0700)]
am
3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
* commit '
3d3cc6e15ea6398105dc59d3135df3e64d5cf34e':
Report actual disk space used
Marco Nelissen [Sun, 5 May 2013 01:17:48 +0000 (01:17 +0000)]
Merge "Report actual disk space used" into jb-mr2-dev
Dianne Hackborn [Thu, 2 May 2013 22:15:17 +0000 (15:15 -0700)]
am
4fc27d79: Merge "Fix issue #
8768456: Settings > App Info under reports..." into jb-mr2-dev
* commit '
4fc27d79c29646b08ff059abc19cc4a7bccaa316':
Fix issue #
8768456: Settings > App Info under reports...
Dianne Hackborn [Thu, 2 May 2013 22:11:17 +0000 (22:11 +0000)]
Merge "Fix issue #
8768456: Settings > App Info under reports..." into jb-mr2-dev
Jesse Hall [Thu, 2 May 2013 20:48:00 +0000 (13:48 -0700)]
am
c8639351: Generate new EGLExt class
* commit '
c86393510c8747519fe34e5aa38ce5218593c19c':
Generate new EGLExt class
Jesse Hall [Tue, 30 Apr 2013 20:45:14 +0000 (13:45 -0700)]
Generate new EGLExt class
Initially populated with EGL_ANDROID_presentation_time (moved from the
EGL14 class) and the ES-relevant parts of EGL_KHR_create_context.
Bug:
8678160
Change-Id: Ifed2ee3da264ca701ae1f4b309a0758f7fcc3acc
Dianne Hackborn [Thu, 2 May 2013 01:55:10 +0000 (18:55 -0700)]
Fix issue #
8768456: Settings > App Info under reports...
...app storage size for apps w/ .so files
The lib directories are tagged with the apk install number,
so must be explicitly passed down to installd.
Change-Id: Iae8815afd6ba964f5b2ed86a0d04a91827391ed6
Marco Nelissen [Wed, 1 May 2013 17:10:59 +0000 (10:10 -0700)]
Report actual disk space used
Report size based on blocks used, not the "nominal" size.
b/
8744465
Change-Id: Idbb72f47af6d475b51305a14be291bf01acb14bb
Jesse Hall [Wed, 1 May 2013 02:32:39 +0000 (19:32 -0700)]
am
cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
* commit '
cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a':
Fix glGetUniformIndices JNI prototype
Jesse Hall [Wed, 1 May 2013 02:30:47 +0000 (02:30 +0000)]
Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
Andy McFadden [Wed, 1 May 2013 00:45:36 +0000 (17:45 -0700)]
am
5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
* commit '
5d46b04bd5a8ec00ea527b68aa48907d3978a007':
Recommend different time source
Andy McFadden [Wed, 1 May 2013 00:43:55 +0000 (00:43 +0000)]
Merge "Recommend different time source" into jb-mr2-dev
Jesse Hall [Mon, 29 Apr 2013 22:58:38 +0000 (15:58 -0700)]
Fix glGetUniformIndices JNI prototype
Bug:
8657863
Change-Id: I130d1b54d0cbd1f8613d3108482526d05d73d9e4
Andy McFadden [Fri, 26 Apr 2013 18:17:57 +0000 (11:17 -0700)]
Recommend different time source
We were recommending SystemClock#uptimeMillis() from Java code, but
millisecond resolution is a little coarse. We don't have an
appropriate call in SystemClock, so use System.nanoTime() instead.
Bug
8733179
Change-Id: Ifb85a03eabf7ff168966adcb5ed5914bbf3884b2
Jamie Gennis [Sat, 27 Apr 2013 00:54:02 +0000 (17:54 -0700)]
am
f6d1c393: EGL: expose the EGL_KHR_create_context extension
* commit '
f6d1c3930eeba6b089ba12fb82ecad1c6622e550':
EGL: expose the EGL_KHR_create_context extension
Jamie Gennis [Fri, 26 Apr 2013 01:48:41 +0000 (18:48 -0700)]
EGL: expose the EGL_KHR_create_context extension
Bug:
8616866
Change-Id: Ic60f9f21397a1760c552b6f141d5177d1cbaf1f8
Jamie Gennis [Thu, 25 Apr 2013 19:41:28 +0000 (12:41 -0700)]
am
5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
* commit '
5b6ebd716c2bae657898562997ebb3b7d7b8a575':
libgui_test: fix a couple minor test issues
Jamie Gennis [Thu, 25 Apr 2013 19:39:10 +0000 (19:39 +0000)]
Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
Jamie Gennis [Tue, 23 Apr 2013 22:00:45 +0000 (15:00 -0700)]
libgui_test: fix a couple minor test issues
This change fixes how the MultiTextureConsumerTest.EGLImageTargetWorks checks
for pixels. It removes the call to eglSwapBuffers so that the test does not
rely on EGL swap-preserve behavior, and it makes the test use checkPixel()
rather than doing glReadPixels itself.
Bug:
8349336
Change-Id: I0f446a0083eebd07af6fd208762878b4e367725a
Matthew Xie [Tue, 23 Apr 2013 22:52:54 +0000 (15:52 -0700)]
am
3cf12f41: Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
* commit '
3cf12f4112167cb3372cbdba2b66d48a5d56dc4b':
Add hardware feature android.hardware.bluetooth.le xml file
Matthew Xie [Tue, 23 Apr 2013 22:47:36 +0000 (22:47 +0000)]
Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
Matthew Xie [Thu, 18 Apr 2013 22:32:04 +0000 (15:32 -0700)]
Add hardware feature android.hardware.bluetooth.le xml file
The feature is used to differ platforms that support bluetooth low
engery radio
bug
8369273
Change-Id: I8714b6b03a4e5692d4573ea7c156b002b7ee42dd
Mathias Agopian [Tue, 23 Apr 2013 10:50:30 +0000 (03:50 -0700)]
am
e692ab9a: fix uninitialized variables in GLConsumer
* commit '
e692ab9a6be63193c5b52a6562d85d06c40463b8':
fix uninitialized variables in GLConsumer
Mathias Agopian [Mon, 22 Apr 2013 09:24:02 +0000 (11:24 +0200)]
fix uninitialized variables in GLConsumer
mDefaultWidth, mDefaultHeight and mCurrentScallingMode are now
initialized to the same default value that BufferQueue uses.
Change-Id: I0d4da2022b06419d12745716d8ddbd48c8869953
Mathias Agopian [Fri, 19 Apr 2013 01:11:55 +0000 (18:11 -0700)]
am
bd115338: allow dumpsys SurfaceFlinger in user builds from the shell user
* commit '
bd1153382e7a9d89922bea999a52ca21d46d6caa':
allow dumpsys SurfaceFlinger in user builds from the shell user
Mathias Agopian [Thu, 18 Apr 2013 23:41:04 +0000 (16:41 -0700)]
allow dumpsys SurfaceFlinger in user builds from the shell user
Bug:
8659013
Change-Id: I1de43bb5808cb8c1103cfc73dca59ff70fc13f91
Jaikumar Ganesh [Thu, 18 Apr 2013 04:58:12 +0000 (21:58 -0700)]
am
379f0f04: Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
* commit '
379f0f04cca66b5fe3dcd96ef81b267d8fc0de03':
Fix activation issue with auto disabled sensors.
Jaikumar Ganesh [Thu, 18 Apr 2013 04:56:29 +0000 (04:56 +0000)]
Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
Jaikumar Ganesh [Tue, 16 Apr 2013 22:52:23 +0000 (15:52 -0700)]
Fix activation issue with auto disabled sensors.
Auto disabled sensors get auto disabled after trigger.
An activation after this wasn't working because the
state was not being reset.
b/
8609561
Change-Id: If72c9f27345e91671d7ad0a7a066f6dc3d255b78
Igor Murashkin [Wed, 17 Apr 2013 19:44:23 +0000 (12:44 -0700)]
am
187edf93: Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
* commit '
187edf93c6245bb8fb3187c49f2174492ed6e049':
BufferItemConsumer: add functions to set default buffer format/size
Igor Murashkin [Wed, 17 Apr 2013 19:39:52 +0000 (19:39 +0000)]
Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
Mathias Agopian [Wed, 17 Apr 2013 06:36:58 +0000 (23:36 -0700)]
am
f31510a2: Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
* commit '
f31510a2ac0807cf3d4224a73fc3f8f691f42f5a':
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
Mathias Agopian [Wed, 17 Apr 2013 06:32:38 +0000 (23:32 -0700)]
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
Bug:
8395618
Change-Id: I160d29699593b11058533ca753e275d5deeb3b54
Mathias Agopian [Wed, 17 Apr 2013 00:04:42 +0000 (17:04 -0700)]
am
ed6d08b7: fix "traceGpuCompletion" debug feature
* commit '
ed6d08b70d775852f4827471814c83eba3606aaa':
fix "traceGpuCompletion" debug feature
Mathias Agopian [Tue, 16 Apr 2013 23:39:46 +0000 (16:39 -0700)]
fix "traceGpuCompletion" debug feature
eglCreateSyncKHR requires a call to glFlush which we were not doing.
fixed by moving the code above eglSwapBuffers(), which both
fixes the problem and gives us a slightly better idea of when
the GPU is done drawing.
Change-Id: Ic826ef1fe25a6247742c3d49d0cb69f4031e3593
Jesse Hall [Tue, 16 Apr 2013 21:31:17 +0000 (14:31 -0700)]
am
2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev
* commit '
2f67faeb801dd6eb8fff8f8aab3843f2532c941d':
Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
Special-case glGetActiveUniformBlockName
Special-case glGetStringi
Special-case glMapBufferRange
Special-case glGetBufferPointerv
Special-case glGetUniformIndices
Special-case glGetTransformFeedbackVarying
Special-case glTransformFeedbackVaryings
Add buffer object versions of several functions
Add *int64 and GLsync types and related functions
Add ES3 functions and constants, difficult ones commented out
Support "const GLChar*" and "const GLenum*" types
Minor changes to ES3 functions inherited from ES2
Generate GLES30 class, just a clone of GLES20 for now
Jesse Hall [Tue, 16 Apr 2013 21:29:39 +0000 (21:29 +0000)]
Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev
* changes:
Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
Special-case glGetActiveUniformBlockName
Special-case glGetStringi
Special-case glMapBufferRange
Special-case glGetBufferPointerv
Special-case glGetUniformIndices
Special-case glGetTransformFeedbackVarying
Special-case glTransformFeedbackVaryings
Add buffer object versions of several functions
Add *int64 and GLsync types and related functions
Add ES3 functions and constants, difficult ones commented out
Support "const GLChar*" and "const GLenum*" types
Minor changes to ES3 functions inherited from ES2
Generate GLES30 class, just a clone of GLES20 for now
Igor Murashkin [Tue, 16 Apr 2013 18:24:40 +0000 (11:24 -0700)]
BufferItemConsumer: add functions to set default buffer format/size
Bug:
8629088
Change-Id: I06f2e26a70d6dbcfcd70b08b4461e8e401f6e83f
Jesse Hall [Mon, 15 Apr 2013 23:35:08 +0000 (16:35 -0700)]
Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
Bug:
8566953
Change-Id: I66085c300a8658a4018796645257edb73be94719
The Android Open Source Project [Mon, 15 Apr 2013 17:46:12 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I98befd6a263feb5235d4a8aa20abff47a2a8a097
The Android Automerger [Mon, 15 Apr 2013 12:55:54 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Sat, 13 Apr 2013 21:21:01 +0000 (14:21 -0700)]
am
883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev
* commit '
883daf6eed36c11a7cb458f07a88e7a9cea29c27':
Make gen more readable, use UNIX-style line endings
Jesse Hall [Sat, 13 Apr 2013 21:18:25 +0000 (21:18 +0000)]
Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev
Mathias Agopian [Sat, 13 Apr 2013 00:32:30 +0000 (17:32 -0700)]
am
48be3232: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
* commit '
48be323236f9fc41620a17e182eea800351812c5':
make sure to update the "current state" when we "fake" the transaction
Mathias Agopian [Sat, 13 Apr 2013 00:27:31 +0000 (00:27 +0000)]
Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
Jaikumar Ganesh [Sat, 13 Apr 2013 00:25:38 +0000 (17:25 -0700)]
am
2ea0c67d: Merge "Sensor changes." into jb-mr2-dev
* commit '
2ea0c67da6770a840d871a69c61bb52d73dadf2b':
Sensor changes.
Jaikumar Ganesh [Sat, 13 Apr 2013 00:22:38 +0000 (00:22 +0000)]
Merge "Sensor changes." into jb-mr2-dev
Dianne Hackborn [Sat, 13 Apr 2013 00:06:29 +0000 (17:06 -0700)]
am
9380d78c: Add new resources trace.
* commit '
9380d78c98d8b8fbce9ade5881fab7134fadc015':
Add new resources trace.
Dianne Hackborn [Fri, 12 Apr 2013 21:52:35 +0000 (14:52 -0700)]
Add new resources trace.
Change-Id: Iab8c1ef51f491e818fb4bab0ba7a042f0d9bec9a
Mathias Agopian [Fri, 12 Apr 2013 23:58:11 +0000 (16:58 -0700)]
make sure to update the "current state" when we "fake" the transaction
this mimics the code we used for the size. basically we need to
also update the "current state" because it gets copied to the
"drawing state" when a transaction occurs, and it would
"undo" our change.
Bug:
8511430
Bug:
8581533
Change-Id: I08c02abbf21b7f168f7124cd14ee717d7d3d502c
Jaikumar Ganesh [Mon, 8 Apr 2013 23:43:12 +0000 (16:43 -0700)]
Sensor changes.
1. Some sensors can wake up the AP. Add wakelocks.
2. Handle backward compatibility for rotation vector
heading accuracy.
3. Cleanup auto disabled sensors.
4. Fix race condition between enable and dispatch.
Change-Id: I39dddf12e208d83cd288201986ee994312555820
Chet Haase [Fri, 12 Apr 2013 14:13:55 +0000 (07:13 -0700)]
am
5e5bed60: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev
* commit '
5e5bed60d03b5556ada351b010ed14ae8f1515ae':
DO NOT MERGE Make sure surfaces always have latest orientation info
Chet Haase [Fri, 12 Apr 2013 14:11:53 +0000 (14:11 +0000)]
Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" 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
Mathias Agopian [Fri, 12 Apr 2013 03:22:23 +0000 (20:22 -0700)]
am
453cfe0b: Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
* commit '
453cfe0bfe06f3cbd87c8c42fa641756ab466b06':
Improve screenshot performance on some devices (DO NOT MERGE)
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
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 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: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: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 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: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: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:36:03 +0000 (13:36 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2e2b858b5fee36a390f92f657a171d2898ae9810
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: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
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: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: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