Jesse Hall
3451f2e235
am 4d3eaedd: am cbc7300c: EmuGL: enable SurfaceTexture async mode
...
* commit '4d3eaeddf27b944d40d1b1d95ae4343574d2e9d4':
2012-02-27 13:58:49 -08:00
Jesse Hall
c765e79a83
am 124d1804: am 7ef79e49: EmuGL: don\'t [de]queue buffers in eglMakeCurrent
...
* commit '124d18041b8c262f47e16a3e10d26f35e9deb597':
EmuGL: don't [de]queue buffers in eglMakeCurrent
2012-02-27 13:57:57 -08:00
Jesse Hall
a59610fab6
am 9e016ede: am cbc7300c: EmuGL: enable SurfaceTexture async mode
...
* commit '9e016ede0973c0abad33de07d92c7cb8bee09cd2':
EmuGL: enable SurfaceTexture async mode
2012-02-27 13:57:55 -08:00
Jesse Hall
4d3eaeddf2
am cbc7300c: EmuGL: enable SurfaceTexture async mode
...
* commit 'cbc7300cb209a4fd3b250546c72c35b7bb0aa8a1':
EmuGL: enable SurfaceTexture async mode
2012-02-27 13:55:47 -08:00
Jesse Hall
124d18041b
am 7ef79e49: EmuGL: don\'t [de]queue buffers in eglMakeCurrent
...
* commit '7ef79e49c7e8f1ecf19a92114f41de39d102a3e8':
EmuGL: don't [de]queue buffers in eglMakeCurrent
2012-02-27 13:55:39 -08:00
Jesse Hall
9e016ede09
am cbc7300c: EmuGL: enable SurfaceTexture async mode
...
* commit 'cbc7300cb209a4fd3b250546c72c35b7bb0aa8a1':
EmuGL: enable SurfaceTexture async mode
2012-02-27 13:55:37 -08:00
Jesse Hall
7ef79e49c7
EmuGL: don't [de]queue buffers in eglMakeCurrent
...
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
2012-02-24 15:54:59 -08:00
Jesse Hall
cbc7300cb2
EmuGL: enable SurfaceTexture async mode
...
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
2012-02-24 15:54:58 -08:00
The Android Open Source Project
1e40e8433d
am ee87007e: Reconcile with ics-mr1-release
...
* commit 'ee87007e15b1c171911e43713582efd9b187d205':
2012-02-24 14:09:27 -08:00
The Android Open Source Project
ee87007e15
Reconcile with ics-mr1-release
...
Change-Id: Iea2f9c952029f0b86da7a550c2c2bf7c8a1be485
2012-02-24 14:05:47 -08:00
The Android Open Source Project
561741493b
am 05d10ed4: Reconcile with ics-mr1-release
...
* commit '05d10ed415f5025e6ee6cf657184c1455d03d2a4':
2012-02-24 13:59:22 -08:00
The Android Open Source Project
05d10ed415
Reconcile with ics-mr1-release
...
Change-Id: I55bb8fb60cb7af23c0219a32aa18a25031592bbf
2012-02-24 13:57:35 -08:00
Jesse Hall
23abe1ec1f
am f5229261: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
...
* commit 'f522926103c9bbbe6a05cd191f287de6f35930b3':
2012-02-24 12:12:01 -08:00
Jesse Hall
bcd311ce0b
am 9cb15c9e: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
...
* commit '9cb15c9e813e03f961634f868b0d4b869a04fa57':
EmuGL: GLESv2 support for OES_EGL_image_external
2012-02-24 12:10:11 -08:00
Jesse Hall
9cb15c9e81
am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
...
* commit '8bd39ae17caac6d275d785ce9420d7e643f15eb9':
EmuGL: GLESv2 support for OES_EGL_image_external
2012-02-24 12:08:38 -08:00
Jesse Hall
f522926103
am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
...
* commit '8bd39ae17caac6d275d785ce9420d7e643f15eb9':
EmuGL: GLESv2 support for OES_EGL_image_external
2012-02-24 12:08:18 -08:00
Jesse Hall
8bd39ae17c
Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
2012-02-24 12:06:20 -08:00
Tor Norbye
99c486f88f
am c85a73bf: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge.
...
* commit 'c85a73bf281bd96510334d413845da99af31b54c':
2012-02-23 18:13:13 -08:00
Tor Norbye
1c0deccda9
am 9ce81e38: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge.
...
* commit '9ce81e383a7d16be39f0598c077d57b2373fd510':
Fix version metadata for java.lang.reflect.Field. do not merge.
2012-02-23 18:12:42 -08:00
Tor Norbye
9ce81e383a
am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge.
...
* commit '010763059f205a0060455acc158c95c7183f5c91':
Fix version metadata for java.lang.reflect.Field. do not merge.
2012-02-23 18:10:21 -08:00
Tor Norbye
c85a73bf28
am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge.
...
* commit '010763059f205a0060455acc158c95c7183f5c91':
Fix version metadata for java.lang.reflect.Field. do not merge.
2012-02-23 18:10:15 -08:00
Tor Norbye
010763059f
Fix version metadata for java.lang.reflect.Field. do not merge.
...
(cherry picked from commit 9ada0ac8f4 )
Change-Id: Ic51aaa81e5a569a6384ac4e9f26b715801e13f1d
2012-02-23 18:07:42 -08:00
The Android Automerger
02cffa999e
merge in ics-mr1-release history after reset to ics-mr1
2012-02-23 10:44:06 -08:00
Jesse Hall
d6bd1843ce
EmuGL: GLESv2 support for OES_EGL_image_external
...
Change-Id: I8911328d5dcccdf4731bd2d8fd953c12fdec5f1b
2012-02-22 15:03:30 -08:00
Jesse Hall
a599ef023f
am ac8acce5: am 00e61338: EmuGL: refinements to GLESv1 image_external
...
* commit 'ac8acce59ede348ccc857754b9b65f29fe59779f':
2012-02-22 13:51:47 -08:00
Jesse Hall
ba8c8d1591
am 66a386e3: am 00e61338: EmuGL: refinements to GLESv1 image_external
...
* commit '66a386e33a23b48b59eae17888c12d7f85d6cdfd':
EmuGL: refinements to GLESv1 image_external
2012-02-22 13:50:07 -08:00
Jesse Hall
f217f2062d
am 71f28afa: am ac018fe3: EmuGL: refcount ColorBuffers on the host
...
* commit '71f28afa4cdfa5993c03f23da3c6602d00b81632':
2012-02-22 13:48:41 -08:00
Jesse Hall
4660966b79
am 144e1b59: am ac018fe3: EmuGL: refcount ColorBuffers on the host
...
* commit '144e1b59982892051c91b1c135a7c5a151cc342d':
EmuGL: refcount ColorBuffers on the host
2012-02-22 13:48:20 -08:00
Jesse Hall
66a386e33a
am 00e61338: EmuGL: refinements to GLESv1 image_external
...
* commit '00e61338b8374de090e81537047846ca06f88280':
EmuGL: refinements to GLESv1 image_external
2012-02-22 13:47:27 -08:00
Jesse Hall
ac8acce59e
am 00e61338: EmuGL: refinements to GLESv1 image_external
...
* commit '00e61338b8374de090e81537047846ca06f88280':
EmuGL: refinements to GLESv1 image_external
2012-02-22 13:47:22 -08:00
Jesse Hall
144e1b5998
am ac018fe3: EmuGL: refcount ColorBuffers on the host
...
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
EmuGL: refcount ColorBuffers on the host
2012-02-22 13:45:42 -08:00
Jesse Hall
71f28afa4c
am ac018fe3: EmuGL: refcount ColorBuffers on the host
...
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
EmuGL: refcount ColorBuffers on the host
2012-02-22 13:45:34 -08:00
Jesse Hall
031ea39c25
am 1a5e2350: am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures
...
* commit '1a5e2350745b97b9e7ea415376b1312fa63b2369':
2012-02-22 10:15:38 -08:00
Jesse Hall
2419e67b07
am fc7a319e: am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures
...
* commit 'fc7a319e5c60cb634df20d6a7fcb6f23a584b449':
GLESv2 translator: don't delete EGLImage textures
2012-02-22 10:15:27 -08:00
Jesse Hall
fc7a319e5c
am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures
...
* commit '91d4e8e195592dbc812441597118452f887ea07d':
GLESv2 translator: don't delete EGLImage textures
2012-02-22 10:11:31 -08:00
Jesse Hall
1a5e235074
am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures
...
* commit '91d4e8e195592dbc812441597118452f887ea07d':
GLESv2 translator: don't delete EGLImage textures
2012-02-22 10:10:54 -08:00
Jesse Hall
00e61338b8
EmuGL: refinements to GLESv1 image_external
...
* 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
2012-02-21 11:13:20 -08:00
Jesse Hall
ac018fe3f6
EmuGL: refcount ColorBuffers on the host
...
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
2012-02-21 11:13:20 -08:00
Jesse Hall
91d4e8e195
GLESv2 translator: don't delete EGLImage textures
...
Copy changes faaf1553cf and
f37a7ed6c5 from the GLESv1 translator to
the GLESv2 translator. After this, both translators use the same logic
for glEGLImageTargetTexture2DOES().
Change-Id: I0a95bf2301df7b7428abc593f38170edf4cbda30
2012-02-21 11:13:19 -08:00
The Android Open Source Project
5cba0cbcac
am f57689a2: Reconcile with ics-mr1-release
...
* commit 'f57689a2875c5834e583d269149555f87eb69629':
2012-02-17 09:04:05 -08:00
The Android Open Source Project
f57689a287
Reconcile with ics-mr1-release
...
Change-Id: I6c51c02fe1de073b1bb5d3cd73e9a072286b4cb8
2012-02-17 09:02:42 -08:00
The Android Open Source Project
1800a2f2d8
am 790c9ce6: Reconcile with ics-mr1-release
...
* commit '790c9ce6591f4f3f5abfbf4de6f056c10f491800':
2012-02-17 08:11:34 -08:00
The Android Open Source Project
790c9ce659
Reconcile with ics-mr1-release
...
Change-Id: Ied11f64a3034d8c8a29f2c68151f3e23564c6a69
2012-02-17 08:09:27 -08:00
The Android Automerger
cecde327e3
merge in ics-mr1-release history after reset to ics-mr1
2012-02-16 16:24:50 -08:00
Xavier Ducrohet
47a86260ee
am 95605614: am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit '95605614afcbcc77b80f90124085516637be11cf':
2012-02-16 15:36:29 -08:00
Xavier Ducrohet
8ed7b3bef6
am b89ad503: am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit 'b89ad503b3840d5c3f2686c9f19183ce1c711404':
Increase platform sdk package revision. do not merge.
2012-02-16 15:36:01 -08:00
Xavier Ducrohet
95605614af
am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
Increase platform sdk package revision. do not merge.
2012-02-16 15:34:11 -08:00
Xavier Ducrohet
b89ad503b3
am fd9cdb46: Increase platform sdk package revision. do not merge.
...
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
Increase platform sdk package revision. do not merge.
2012-02-16 15:33:18 -08:00
Xavier Ducrohet
fd9cdb46a0
Increase platform sdk package revision. do not merge.
...
Change-Id: I51125369a0b2ba1376a66924b04b0cd825d82f5d
2012-02-16 15:31:20 -08:00
The Android Open Source Project
d2cfa3f7ce
am b6f94723: Reconcile with ics-mr1-release
...
* commit 'b6f947238f459be80a9327890992c32bc89b5674':
2012-02-16 10:16:10 -08:00