android_development/tools, branch ics-release

Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/development into aosp

2012-03-29T06:05:31+00:00

Add missing includes for threads.h

2012-03-14T18:11:56+00:00

The missing headers were being transitively included through a
Skia header which is being removed.

Change-Id: I6a5b26c1f1bb3ed4c65e7e39fff3b927cb14eabf

Work around a y-invert bug on Macs w/ Intel GPU

2012-03-07T18:06:57+00:00

On Macs running OS X 10.6 and 10.7 with Intel HD Graphics 3000, some
screens or parts of the screen are displayed upside down. The exact
conditions/sequence that triggers this aren't known yet; I haven't
been able to reproduce it in a standalone test. This also means I
don't know whether it is a driver bug, or a bug in the OpenglRender or
Translator code that just happens to work elsewhere.

Thanks to zhiyuan.li@intel.com for a patch this change is based on.

Change-Id: I04823773818d3b587a6951be48e70b03804b33d0

Delete dead code.

2012-03-07T18:06:37+00:00

Change-Id: I5b87fac4e2140a903221a1f68b16fa6a96e5effc

EmuGL: don't [de]queue buffers in eglMakeCurrent

2012-02-24T23:54:59+00:00

Whenever a surface was attached to a context, it was dequeing a new
buffer, and enqueing it when detached. This has the effect of doing a
SwapBuffers on detach/attach cycle, which is just wrong and
occasionally caused visible glitches (e.g. animations going backwards
for one frame). It also broke some SurfaceTexture tests which
(validly) depend on specific buffer production/consumption counts.

Change-Id: Ibd4761e8842871b79fd9edf52272900193cb672d

EmuGL: enable SurfaceTexture async mode

2012-02-24T23:54:58+00:00

Pass the swap interval from eglSwapInterval to the native window so it
can enable/disable SurfaceTexture's async mode. Fixes the deadlock in
SurfaceTextureGLToGLTest.EglDestroySurfaceUnrefsBuffers.

Change-Id: I19bf69247341f5617223722df63d6c7f8cf389c6

EmuGL: GLESv2 support for OES_EGL_image_external

2012-02-22T23:03:30+00:00

Change-Id: I8911328d5dcccdf4731bd2d8fd953c12fdec5f1b

EmuGL: refinements to GLESv1 image_external

2012-02-21T19:13:20+00:00

* EGLImageTargetRenderbufferStorageOES was incorrectly accepting
  TEXTURE_EXTERNAL_OES as a target. Revert that; the host GL will
  correctly reject it with INVALID_ENUM.

* Handle the REQUIRED_TEXTURE_IMAGE_UNITS_OES texparameter query.

* Validate texture parameters set on TEXTURE_EXTERNAL textures;
  otherwise invalid parameters would work on the emulator but not on a
  real device.

Change-Id: I49a088608d58a9822f33e5916bd354eee3709127

EmuGL: refcount ColorBuffers on the host

2012-02-21T19:13:20+00:00

The gralloc API assumes system-wide reference counting of gralloc
buffers. The host-GL accelerated gralloc maps buffers to host-side
ColorBuffer objects, but was destroying them unconditionally in
gralloc_free(), ignoring any additional references from
gralloc_register_buffer().

This affected the SurfaceTexture gralloc buffers used by the
Browser/WebView. For some reason these buffers are actually allocated
by SurfaceFlinger and passed back to the WebView through Binder. But
since SurfaceFlinger doesn't actually need the buffer for anything,
sometime after the WebView has called gralloc_register_buffer()
SurfaceFlinger calls gralloc_free() on it. This caused the host
ColorBuffer to be destroyed long before the WebView is done using it.

Change-Id: I33dbee887a48a6907041cf19e9f38a1f6c983eff

GLESv2 translator: don't delete EGLImage textures

2012-02-21T19:13:19+00:00

Copy changes faaf1553cfa39c23ceb198ba7edbd46ff3a11f7a and
f37a7ed6c5c609a3afc33f81bf50893362917ae6 from the GLESv1 translator to
the GLESv2 translator. After this, both translators use the same logic
for glEGLImageTargetTexture2DOES().

Change-Id: I0a95bf2301df7b7428abc593f38170edf4cbda30