OSDN Git Service

android-x86/frameworks-native.git
11 years agoGenerate 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

11 years agoMerge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
Jesse Hall [Wed, 1 May 2013 02:30:47 +0000 (02:30 +0000)]
Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev

11 years agoMerge "Recommend different time source" into jb-mr2-dev
Andy McFadden [Wed, 1 May 2013 00:43:55 +0000 (00:43 +0000)]
Merge "Recommend different time source" into jb-mr2-dev

11 years agoFix glGetUniformIndices JNI prototype
Jesse Hall [Mon, 29 Apr 2013 22:58:38 +0000 (15:58 -0700)]
Fix glGetUniformIndices JNI prototype

Bug: 8657863
Change-Id: I130d1b54d0cbd1f8613d3108482526d05d73d9e4

11 years agoRecommend different time source
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

11 years agoEGL: 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

11 years agoMerge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
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

11 years agolibgui_test: fix a couple minor test issues
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

11 years agoMerge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev
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

11 years agoAdd hardware feature android.hardware.bluetooth.le xml file
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

11 years agofix 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

11 years agoallow 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

11 years agoMerge "Fix activation issue with auto disabled sensors." into jb-mr2-dev
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

11 years agoFix activation issue with auto disabled sensors.
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

11 years agoMerge "BufferItemConsumer: add functions to set default buffer format/size" into...
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

11 years agoAdd 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

11 years agofix "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

11 years agoMerge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f...
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

11 years agoBufferItemConsumer: add functions to set default buffer format/size
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

11 years agoSubclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
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

11 years agoMerge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev
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

11 years agoMerge "make sure to update the "current state" when we "fake" the transaction" into...
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

11 years agoMerge "Sensor changes." into jb-mr2-dev
Jaikumar Ganesh [Sat, 13 Apr 2013 00:22:38 +0000 (00:22 +0000)]
Merge "Sensor changes." into jb-mr2-dev

11 years agoAdd new resources trace.
Dianne Hackborn [Fri, 12 Apr 2013 21:52:35 +0000 (14:52 -0700)]
Add new resources trace.

Change-Id: Iab8c1ef51f491e818fb4bab0ba7a042f0d9bec9a

11 years agomake sure to update the "current state" when we "fake" the transaction
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

11 years agoSensor changes.
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

11 years agoMerge "DO NOT MERGE Make sure surfaces always have latest orientation info" into...
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

11 years agoMerge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
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

11 years agoImprove screenshot performance on some devices (DO NOT MERGE)
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

11 years agoDO NOT MERGE Make sure surfaces always have latest orientation info
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

11 years agoMerge "Updated comments" into jb-mr2-dev
Andy McFadden [Thu, 11 Apr 2013 17:15:52 +0000 (17:15 +0000)]
Merge "Updated comments" into jb-mr2-dev

11 years agoSpecial-case glGetActiveUniformBlockName
Jesse Hall [Thu, 11 Apr 2013 04:49:55 +0000 (21:49 -0700)]
Special-case glGetActiveUniformBlockName

Bug: 8566953
Change-Id: Ic9b3be9fa0136495633ee3b1c38583cfa315942a

11 years agoSpecial-case glGetStringi
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

11 years agoSpecial-case glMapBufferRange
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

11 years agoSpecial-case glGetBufferPointerv
Jesse Hall [Wed, 10 Apr 2013 22:48:58 +0000 (15:48 -0700)]
Special-case glGetBufferPointerv

Bug: 8566953
Change-Id: I11a7394eb46f229fd3ae716e77487a45bac6ed53

11 years agoSpecial-case glGetUniformIndices
Jesse Hall [Wed, 10 Apr 2013 16:26:48 +0000 (09:26 -0700)]
Special-case glGetUniformIndices

Bug: 8566953
Change-Id: Ic8bcd03e8d41a81f48d603f67ce2046a4afa1561

11 years agoSpecial-case glGetTransformFeedbackVarying
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

11 years agoSpecial-case glTransformFeedbackVaryings
Jesse Hall [Wed, 10 Apr 2013 07:34:07 +0000 (00:34 -0700)]
Special-case glTransformFeedbackVaryings

Bug: 8566953
Change-Id: I02a1548aebc12bd3599903029bfd2e4ccea53211

11 years agoAdd buffer object versions of several functions
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

11 years agoAdd *int64 and GLsync types and related functions
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

11 years agoAdd ES3 functions and constants, difficult ones commented out
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

11 years agoMerge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
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

11 years agofix another bug where screenshots could end-up all black
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

11 years agoMake gen more readable, use UNIX-style line endings
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

11 years agoSupport "const GLChar*" and "const GLenum*" types
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

11 years agoMinor changes to ES3 functions inherited from ES2
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

11 years agoGenerate GLES30 class, just a clone of GLES20 for now
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

11 years agoMerge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:17:07 +0000 (05:17 +0000)]
Merge "Add liblog" into jb-mr2-dev

11 years agoAdd liblog
Ying Wang [Wed, 10 Apr 2013 04:55:39 +0000 (21:55 -0700)]
Add liblog

Bug: 8580410
Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506

11 years agoMerge changes I82e361a6,I83694682 into jb-mr2-dev
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

11 years agolibgui_test: increase the tolerance for a YUV test
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

11 years agolibgui: fix an EGLImage leak
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

11 years agoMerge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
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

11 years agoMerge "Actually set the virtual display output buffer." 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

11 years agoTell HWComposer the dimensions of virtual displays
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

11 years agoUpdated comments
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

11 years agofix local include paths
Mathias Agopian [Fri, 5 Apr 2013 06:17:56 +0000 (23:17 -0700)]
fix local include paths

Change-Id: Icb921fa796ec08612dbb2feb7e7161bcb0cf4a99

11 years agoMerge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
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

11 years agoMerge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
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

11 years agoActually set the virtual display output buffer.
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

11 years agoImplement async event callout from drm plugin to Java app
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

11 years agolatch transparent region hint only when we get a new frame
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

11 years agoMerge "Fix include paths" into jb-mr2-dev
Mathias Agopian [Tue, 2 Apr 2013 23:20:15 +0000 (23:20 +0000)]
Merge "Fix include paths" into jb-mr2-dev

11 years agoMerge "MediaDrm API update" 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

11 years agoMediaDrm API update
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

11 years agoFix include paths
Mathias Agopian [Mon, 1 Apr 2013 23:54:58 +0000 (16:54 -0700)]
Fix include paths

Change-Id: If5350a3de995cc0cb1afea067e7ce168bc00d3f5

11 years agoMerge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
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

11 years agoEGL_ANDROID_presentation_time: initial spec draft
Jamie Gennis [Wed, 9 Jan 2013 02:07:17 +0000 (18:07 -0800)]
EGL_ANDROID_presentation_time: initial spec draft

Change-Id: I1cd174a08c499e5bde19e7ecd449da8266e7e66e

11 years agoFix 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

11 years agoMerge "don't use compile-time configuration of libgui as much as possible" into jb...
Mathias Agopian [Fri, 29 Mar 2013 23:31:23 +0000 (23:31 +0000)]
Merge "don't use compile-time configuration of libgui as much as possible" into jb-mr2-dev

11 years agodon't use compile-time configuration of libgui as much as possible
Mathias Agopian [Fri, 29 Mar 2013 00:44:13 +0000 (17:44 -0700)]
don't use compile-time configuration of libgui as much as possible

We now detect at runtime which sync features to use, which
allows us to remove a lot of the compile-time configuration
options. There  is still one option though, to disable
KHR_fence_sync on some devices (which are more efficient
without it).

- added a backdoor to get the vendor's EGL strings

the new logic is:
- use always ANDROID_native_fence_sync if available
- fallback to KHR_fence_sync if available and not disabled
  by the compile-time option
- use KHR_wait_sync if available and either of the above is
  enabled

Change-Id: I9c4b49d9ff1151faf902cc93bd53ea5f205aaabf

11 years agoam e3a396b2: am 906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"
Keun-young Park [Fri, 29 Mar 2013 07:14:16 +0000 (00:14 -0700)]
am e3a396b2: am 906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"

* commit 'e3a396b25d53cc9ae61e3a2f0daeaa68ac1ba5a1':
  [MIPS] Add MIPS architecture support to libagl

11 years agoam 906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"
Keun-young Park [Fri, 29 Mar 2013 07:12:14 +0000 (00:12 -0700)]
am 906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"

* commit '906bd0422a99b37663a1cb130bf061fdbb3ea189':
  [MIPS] Add MIPS architecture support to libagl

11 years agoMerge "[MIPS] Add MIPS architecture support to libagl"
Keun-young Park [Fri, 29 Mar 2013 06:15:58 +0000 (06:15 +0000)]
Merge "[MIPS] Add MIPS architecture support to libagl"

11 years agoam 111d920b: am d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl frame...
Keun-young Park [Fri, 29 Mar 2013 06:09:44 +0000 (23:09 -0700)]
am 111d920b: am d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl framework"

* commit '111d920bb588669006bdd8699e786d6305f14c36':
  [MIPS] Add MIPS architecture support to opengl framework

11 years agoam d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl framework"
Keun-young Park [Fri, 29 Mar 2013 06:08:17 +0000 (23:08 -0700)]
am d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl framework"

* commit 'd3b2c029eba356e7bed3754d60ade556c216348e':
  [MIPS] Add MIPS architecture support to opengl framework

11 years agoMerge "[MIPS] Add MIPS architecture support to opengl framework"
Keun-young Park [Fri, 29 Mar 2013 05:26:27 +0000 (05:26 +0000)]
Merge "[MIPS] Add MIPS architecture support to opengl framework"

11 years agofix uninitialized attribute in SurfaceFlinger
Mathias Agopian [Fri, 29 Mar 2013 00:52:36 +0000 (17:52 -0700)]
fix uninitialized attribute in SurfaceFlinger

Change-Id: I8277f67e297a8b6a99195387060d03154a2cd929

11 years agoMerge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
Mathias Agopian [Thu, 28 Mar 2013 22:51:06 +0000 (22:51 +0000)]
Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev

* changes:
  replace eglWaitSyncANDROID by eglWaitSyncKHR
  update EGL headers to most recent
  cleanup EGL extensions strings and entry-points

11 years agoMerge "Remove unused clz.cpp" into jb-mr2-dev
Jesse Hall [Thu, 28 Mar 2013 22:16:49 +0000 (22:16 +0000)]
Merge "Remove unused clz.cpp" into jb-mr2-dev

11 years agoreplace eglWaitSyncANDROID by eglWaitSyncKHR
Mathias Agopian [Thu, 28 Mar 2013 00:32:41 +0000 (17:32 -0700)]
replace eglWaitSyncANDROID by eglWaitSyncKHR

Change-Id: I22f1b3588011c88389e249f738f1e6915cc97e72

11 years agoupdate EGL headers to most recent
Mathias Agopian [Wed, 27 Mar 2013 21:55:03 +0000 (14:55 -0700)]
update EGL headers to most recent

- add ANDROID extensions missing from official headers:
    EGL_ANDROID_wait_sync
    EGL_ANDROID_presentation_time

Change-Id: I5496d0de123a6279234098c19f9a12220adec876

11 years agocleanup EGL extensions strings and entry-points
Mathias Agopian [Wed, 27 Mar 2013 21:30:19 +0000 (14:30 -0700)]
cleanup EGL extensions strings and entry-points

- move all the code related to EGL extensions in one place

- add missing extension strings:
   EGL_KHR_lock_surface
   EGL_KHR_reusable_sync

- add public extensions strings and entry-points
   EGL_ANDROID_wait_sync
   EGL_ANDROID_presentation_time

- add missing entry-points for EGL_KHR_reusable_sync

Change-Id: Ifd98966b549e8efd8ef5385eba0efde8c4cbc77b

11 years agoatrace: add support for app tracing
Jamie Gennis [Wed, 27 Mar 2013 22:50:58 +0000 (15:50 -0700)]
atrace: add support for app tracing

This change adds support for the -a command line argument to atrace.  This
argument sets the comma separated list of application names (i.e.
/proc/self/cmdline values) for which to enable application-level tracing.

Change-Id: I812d57c4cdc581943247229413f09b7e1adc10d0

11 years agoam 4194b389: am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
Jesse Hall [Thu, 28 Mar 2013 20:22:34 +0000 (13:22 -0700)]
am 4194b389: am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"

* commit '4194b3898df867a5c4377de49ddc72ad3e51122b':
  frameworks/native/opengl: Fix build with gcc 4.8

11 years agoam 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
Jesse Hall [Thu, 28 Mar 2013 20:21:05 +0000 (13:21 -0700)]
am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"

* commit '0b6c41571b636cc9b47005fa971db19430cedc09':
  frameworks/native/opengl: Fix build with gcc 4.8

11 years agoMerge "frameworks/native/opengl: Fix build with gcc 4.8"
Jesse Hall [Thu, 28 Mar 2013 19:28:36 +0000 (19:28 +0000)]
Merge "frameworks/native/opengl: Fix build with gcc 4.8"

11 years agoRemove unused clz.cpp
Jesse Hall [Thu, 28 Mar 2013 19:27:01 +0000 (12:27 -0700)]
Remove unused clz.cpp

Change-Id: Ieed91a45ba0e865a0d47d84effe9439aaab4371f

11 years ago[MIPS] Add MIPS architecture support to opengl framework
Duane Sand [Wed, 27 Mar 2013 17:58:06 +0000 (10:58 -0700)]
[MIPS] Add MIPS architecture support to opengl framework

Change-Id: Id7704d35bed14d96a85dc1f29db0566cd03872b5

11 years agoMerge "atrace: fix tracing on user builds" into jb-mr2-dev
Jamie Gennis [Thu, 28 Mar 2013 18:14:14 +0000 (18:14 +0000)]
Merge "atrace: fix tracing on user builds" into jb-mr2-dev

11 years agoatrace: fix tracing on user builds
Jamie Gennis [Wed, 27 Mar 2013 22:50:30 +0000 (15:50 -0700)]
atrace: fix tracing on user builds

Change-Id: Idef15d514f0bd1e117362c6a06a2ea24314feb7f

11 years agoClean up HWC state when releasing a DisplayDevice
Jesse Hall [Mon, 25 Mar 2013 21:43:23 +0000 (14:43 -0700)]
Clean up HWC state when releasing a DisplayDevice

DisplayDevices can be released when DisplayManager removes them from
the display list, or (for virtual displays) when the surface is set to
NULL. We were only cleaning up HWC resources associated with the
display in the first case.

Bug: 8384764
Change-Id: Id3d226dd7178fbe6d0a2ac4e2660b864ee073de3

11 years ago[MIPS] Add MIPS architecture support to libagl
Duane Sand [Wed, 27 Mar 2013 17:53:14 +0000 (10:53 -0700)]
[MIPS] Add MIPS architecture support to libagl

Change-Id: I30eb92857a2a6ea867fe0ee45109f17609043aae

11 years agoframeworks/native/opengl: Fix build with gcc 4.8
Bernhard Rosenkränzer [Wed, 27 Mar 2013 13:04:34 +0000 (14:04 +0100)]
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>
11 years agoMerge "make sure to unlock the screenshot's buffer on destruction" into jb-mr2-dev
Mathias Agopian [Wed, 27 Mar 2013 01:30:36 +0000 (01:30 +0000)]
Merge "make sure to unlock the screenshot's buffer on destruction" into jb-mr2-dev

11 years agomake sure to unlock the screenshot's buffer on destruction
Mathias Agopian [Wed, 27 Mar 2013 01:15:35 +0000 (18:15 -0700)]
make sure to unlock the screenshot's buffer on destruction

this fixes a memory leak on various devices

Bug: 8475134
Change-Id: I25924674c803a0cb22371a95c60664c36acb0340

11 years agoam 1cd763f1: am cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
Keun-young Park [Tue, 26 Mar 2013 18:45:01 +0000 (11:45 -0700)]
am 1cd763f1: am cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."

* commit '1cd763f123b9f1a2772ddff15ace81ec07b7660c':
  [MIPS] Avoid unaligned load/store for 64-bit doubles.

11 years agoam cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
Keun-young Park [Tue, 26 Mar 2013 18:43:05 +0000 (11:43 -0700)]
am cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."

* commit 'cd91024ca16db96daa697e22f7a088b416a424e3':
  [MIPS] Avoid unaligned load/store for 64-bit doubles.

11 years agoMerge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
Keun-young Park [Tue, 26 Mar 2013 17:47:19 +0000 (17:47 +0000)]
Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."

11 years agoMerge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev
Geremy Condra [Tue, 26 Mar 2013 01:39:21 +0000 (01:39 +0000)]
Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev