Commit Graph

8373 Commits

Author SHA1 Message Date
Xavier Ducrohet
624c487060 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:08 -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
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
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
e5d4521faa Reconcile with ics-mr1-release
Change-Id: I7c31409444255ead260a7fa6969d04c309c9f50b
2012-03-01 10:40:00 -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
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
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
ee87007e15 Reconcile with ics-mr1-release
Change-Id: Iea2f9c952029f0b86da7a550c2c2bf7c8a1be485
2012-02-24 14:05:47 -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
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
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
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
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
f57689a287 Reconcile with ics-mr1-release
Change-Id: I6c51c02fe1de073b1bb5d3cd73e9a072286b4cb8
2012-02-17 09:02:42 -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
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
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
c263b3450f Reconcile with ics-mr1-release
Change-Id: Ibf45e3ef58ab7a50e362da85993c4332636f32f7
2012-02-16 10:10:08 -08:00
Xavier Ducrohet
ae0c9dfd62 am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE.
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
2012-02-16 09:56:04 -08:00
Xavier Ducrohet
52feec594a Update rev numbers of SDK packages. DO NOT MERGE.
Change-Id: Idc750d5bd63186157cd2cb08c28e73e9894c34bd
2012-02-15 18:32:11 -08:00
The Android Automerger
d16ed56822 merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:14:35 -08:00
Adam Powell
1b919a3fb8 am 15a14930: Merge "Add AppNavigation demo" into ics-mr1
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
2012-02-13 14:29:49 -08:00
Adam Powell
15a14930d7 Merge "Add AppNavigation demo" into ics-mr1 2012-02-13 14:27:58 -08:00
Scott Main
12104d3734 am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
  docs: fix minsdkversion for native activity sample
2012-02-09 12:16:41 -08:00
Scott Main
de797a2fb2 Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 2012-02-09 12:15:07 -08:00
Scott Main
41b5bb95c3 docs: fix minsdkversion for native activity sample
Change-Id: I2d45207182f6a5b1743b574f7ab10251efd3a17a
2012-02-09 12:10:27 -08:00
Adam Powell
247df4fe79 Add AppNavigation demo
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.

Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
2012-02-07 15:02:57 -08:00
Jesse Hall
bc96fa33dc am 0e981c83: EmuGL: Fix heap corruption
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
  EmuGL: Fix heap corruption
2012-02-06 13:36:49 -08:00
Jesse Hall
0e981c8304 EmuGL: Fix heap corruption
Off-by-two bug when removing textures from the tracking array could
overwrite malloc's mem chunk data structure, usually resulting in a
heap corruption abort on a later malloc/realloc/free.

Bug: 5951738
Change-Id: I11056bb62883373c2a3403f53899347ff8cdabf2
2012-02-03 22:54:24 -08:00
Trevor Johns
b8504b0a0e am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
  Adding Android Developers Google+ redirect
2012-02-03 13:11:31 -08:00
Trevor Johns
23195b75a4 am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.
2012-02-03 13:09:43 -08:00
Trevor Johns
47365074a0 Merge "Adding Android Developers Google+ redirect" into ics-mr1 2012-02-03 13:08:46 -08:00
Trevor Johns
7a94a9dc49 Merge "Adding manual redirect support to developer.android.com." into ics-mr1 2012-02-03 13:08:23 -08:00
Trevor Johns
22f4efaa12 Adding Android Developers Google+ redirect
Redirect developer.android.com/+ to Google+ page for Android Developers.

Issue: 5933956

Change-Id: I0ed2b076386058f1ac81ea4376aea15fee6b24aa
2012-02-03 12:32:10 -08:00
Xavier Ducrohet
eea4e8e803 am df458cb8: Fix api version file with proper data enum.
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
  Fix api version file with proper data enum.
2012-02-01 13:52:22 -08:00