Commit Graph

8540 Commits

Author SHA1 Message Date
Xavier Ducrohet
3a499b0fed am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '8438213c2fc9aff20c3244dca5a1b30fadcb5785':
  Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:09:33 -08:00
Xavier Ducrohet
1754063ff0 am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '198705d1ab7f818b146c0c6e0d85f80e4b658e06':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:09:32 -08:00
Xavier Ducrohet
8438213c2f am 88d97250: Prepare for doc package update in rev 2. do not merge.
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
  Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:07:39 -08:00
Xavier Ducrohet
198705d1ab am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
  Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:07:38 -08:00
Xavier Ducrohet
88d972501a Prepare for doc package update in rev 2. do not merge.
Change-Id: Ibd1e7b8cd25aed33f4f6abe86ed36ccf30d4c714
2012-03-07 17:52:21 -08:00
Xavier Ducrohet
92b3b05096 Add a prebuilt of the gridlayout support library. do not merge
Change-Id: Icd43238672a02f84e37d4301bec34dbe48375200
2012-03-07 17:47:12 -08:00
Jesse Hall
1beba23120 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp 2012-03-07 11:20:07 -08:00
Jesse Hall
de9127c6b3 am cbd446a9: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit 'cbd446a98ad24ca03a845dfa24cbe4db3f297147':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:19:59 -08:00
Jesse Hall
8b40621965 am ca2d0d1e: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit 'ca2d0d1e8d883d5b2ee0bd78a1dc95c54ce3c642':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:19:59 -08:00
Jesse Hall
1d6ccdfacb am 1f4f50c7: am 767d0894: Delete dead code.
* commit '1f4f50c7d25cd9b95aec869aa57638703b44d4ec':
  Delete dead code.
2012-03-07 11:19:58 -08:00
Jesse Hall
57a6651c5a am f1ba5cf2: am 767d0894: Delete dead code.
* commit 'f1ba5cf21d7da576f80fdbbf6431a65fcd6a198f':
  Delete dead code.
2012-03-07 11:19:58 -08:00
Jesse Hall
cbd446a98a am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit '9322c5cb2524c4f35408768ee3d1b8030f0360f9':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:17:46 -08:00
Jesse Hall
1f4f50c7d2 am 767d0894: Delete dead code.
* commit '767d08948790527e9df951a752703938ff517d30':
  Delete dead code.
2012-03-07 11:17:45 -08:00
Jesse Hall
ca2d0d1e8d am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit '9322c5cb2524c4f35408768ee3d1b8030f0360f9':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:16:58 -08:00
Jesse Hall
f1ba5cf21d am 767d0894: Delete dead code.
* commit '767d08948790527e9df951a752703938ff517d30':
  Delete dead code.
2012-03-07 11:16:56 -08:00
Jesse Hall
9322c5cb25 Work around a y-invert bug on Macs w/ Intel GPU
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
2012-03-07 10:06:57 -08:00
Jesse Hall
767d089487 Delete dead code.
Change-Id: I5b87fac4e2140a903221a1f68b16fa6a96e5effc
2012-03-07 10:06:37 -08:00
Dirk Dougherty
3c7dc0f405 am 3007c3f5: am 9ba4ba70: Doc change: string changes for Google Play
* commit '3007c3f529e427dd1a4b0b5d1eaaa5b694938777':
2012-03-05 21:40:31 -08:00
Dirk Dougherty
b7c3c566f3 am 8d74e4be: am 9ba4ba70: Doc change: string changes for Google Play
* commit '8d74e4bec1bcacbaf14e61fc58680393233bc663':
  Doc change: string changes for Google Play
2012-03-05 21:39:42 -08:00
Dirk Dougherty
8d74e4bec1 am 9ba4ba70: Doc change: string changes for Google Play
* commit '9ba4ba709459ce07161fc683459ae4b4005ed791':
  Doc change: string changes for Google Play
2012-03-05 21:37:41 -08:00
Dirk Dougherty
3007c3f529 am 9ba4ba70: Doc change: string changes for Google Play
* commit '9ba4ba709459ce07161fc683459ae4b4005ed791':
  Doc change: string changes for Google Play
2012-03-05 21:37:17 -08:00
Dirk Dougherty
9ba4ba7094 Doc change: string changes for Google Play
Change-Id: I39acdc4faae23a43d39c2e2976543a946bd656af
2012-03-04 20:54:23 -08:00
The Android Open Source Project
bf4ace987a am e5d4521f: Reconcile with ics-mr1-release
* commit 'e5d4521faae813fcfc2fb0e09199aaec0c337bb0':
2012-03-01 10:43:41 -08:00
The Android Open Source Project
e5d4521faa Reconcile with ics-mr1-release
Change-Id: I7c31409444255ead260a7fa6969d04c309c9f50b
2012-03-01 10:40:00 -08:00
The Android Open Source Project
26cc4ddd0d am 8534a2a7: Reconcile with ics-mr1-release
* commit '8534a2a77e2a28918c0777508514b1279c3a24e5':
2012-03-01 10:14:19 -08:00
The Android Open Source Project
8534a2a77e Reconcile with ics-mr1-release
Change-Id: I0028533f9c4546b0c74b86d3f9f2e114ddfb7a98
2012-03-01 10:11:39 -08:00
The Android Automerger
42b3762e62 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:13:22 -08:00
Jesse Hall
c11eaf3c25 am e1e4316d: am 7ef79e49: EmuGL: don\'t [de]queue buffers in eglMakeCurrent
* commit 'e1e4316d472758c02c4cda24a2b06a90d96411cc':
2012-02-27 13:58:50 -08:00
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
e1e4316d47 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:48 -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
The Android Automerger
aca0904697 merge in ics-mr1-release history after reset to ics-mr1 2012-02-25 10:42:21 -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