Commit Graph

9003 Commits

Author SHA1 Message Date
The Android Open Source Project
89d64178a7 am bf4ace98: am e5d4521f: Reconcile with ics-mr1-release
* commit 'bf4ace987a2cc9639d26046632106aff96ff64b4':
2012-03-01 16:46:21 -08:00
The Android Open Source Project
ee93a5bce0 am 26cc4ddd: am 8534a2a7: Reconcile with ics-mr1-release
* commit '26cc4ddd0d0cb40a45918b30fb057e9d224f581d':
2012-03-01 15:51:18 -08:00
Raphael Moll
eb611a2c28 SDK repo: fix to handle new and old xsd for support lib
Change-Id: Ic6c42a416e115f5f15631d1a1149d2364fbcea69
2012-03-01 13:17:09 -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
Andrew Hsieh
bb6ee33b11 Merge "Fixed crash and 64-bit porting issues" 2012-02-29 16:29:01 -08:00
Raphael Moll
145a30c8a6 Merge "SDK: generate repo using latest schemas when available." 2012-02-29 16:23:51 -08:00
Raphaël Moll
e84f2823e5 Merge "SDK repo: use a template for samples/source.properties." 2012-02-29 16:22:04 -08:00
Raphael Moll
9516dc5aa1 SDK: generate repo using latest schemas when available.
This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
2012-02-29 15:57:41 -08:00
Andrew Hsieh
b100b6fd6a Fixed crash and 64-bit porting issues
1. "emugen" generates four *dec.cpp files containing code like this
   to decode offset to pointer in stream

   tmp = *(T *)(ptr + 8 + 4 + 4 + 4 + *(size_t *)(ptr +8 + 4 + 4));

   If *dec.cpp are compiled in 64-bit, size_t is 8-byte and dereferencing of
   it is likley to get wild offset for dereferencing of *(T *) to crash the
   code.  Solution is to define tsize_t for "target size_t" instead
   of using host size_t.

2. Cast pointer to "uintptr_t" instead of "unsigned int" for 2nd param of
   ShareGroup::getGlobalName(NamedObjectType, ObjectLocalName/*64bit*/).
3. Instance of EGLSurface, EGLContext and EGLImageKHR are used as 32-bit
   key for std::map< unsigned int, * > SurfacesHndlMap, ContextsHndlMap,
   and ImagesHndlMap, respectively.  Cast pointer to uintptr_t and assert
   upper 32-bit is zero before passing to map::find().
4. Instance of GLeglImageOES is used to eglAttachEGLImage() which expect
   "unsigned int".  Cast it to uintptr_t and assert upper 32-bit is zero.
5. The 5th param to GLEScontext::setPointer is GLvoid* but contains 32-bit
   offset to vbo if bufferName exists.  Cast it to uintptr_t and assert
   upper 32-bit is zero.
6. Use %zu instead of %d to print size_t
7. Cast pointer to (uintptr_t) in many other places

Change-Id: Iba6e5bda08c43376db5b011e9d781481ee1f5a12
2012-02-29 15:54:06 -08:00
Xavier Ducrohet
bea50d3562 SDK repo: use a template for samples/source.properties.
Use a template for samples/source.properties so that it automatically
picks up the current platform API level.

Also merges 52feec594a
("Update rev numbers of SDK packages.")

Change-Id: I89574842d2b0290cc6cf454f82a3721644cae0f0
2012-02-29 11:22:54 -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
5186cd9279 am c11eaf3c: am e1e4316d: am 7ef79e49: EmuGL: don\'t [de]queue buffers in eglMakeCurrent
* commit 'c11eaf3c25f912bfd7318c89011d990bf40cc06e':
2012-02-27 22:21:36 -08:00
Jesse Hall
26eeea406a am 3451f2e2: am 4d3eaedd: am cbc7300c: EmuGL: enable SurfaceTexture async mode
* commit '3451f2e235a6842a2396daac27b4ab21cb151811':
2012-02-27 22:21:35 -08:00
Jesse Hall
ad37ddbb1d Merge "resolved conflicts for merge of c765e79a to master" 2012-02-27 20:56:00 -08:00
Mathias Agopian
f60103a9a7 Merge "Android native include paths and symbols for Eclipse IDE" 2012-02-27 18:22:12 -08:00
Guang Zhu
8df87bdd73 Merge "Update the intent that monkey uses to launch application" 2012-02-27 16:37:11 -08:00
Guang Zhu
73421de1a0 Update the intent that monkey uses to launch application
The purpose of the monkey event is to imitate user action of
launching an app from launcher, and apparently launcher is
using one extra flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

Bug: 6007633
Change-Id: Ie42cc84fd6235c9419b96bd9574056ed46687b25
2012-02-27 14:38:55 -08:00
Jesse Hall
073e40031c resolved conflicts for merge of c765e79a to master
Change-Id: Id7018ac9f551ec8b224f030d8b04229ac2407a17
2012-02-27 14:12:32 -08:00
Jesse Hall
5333119e45 am a59610fa: am 9e016ede: am cbc7300c: EmuGL: enable SurfaceTexture async mode
* commit 'a59610fab6893530f15a9cfad8cdd97e4c5d578a':
  EmuGL: enable SurfaceTexture async mode
2012-02-27 14:00:23 -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
Mathias Agopian
9789239a2f Android native include paths and symbols for Eclipse IDE
these are required to get the indexer working properly. the list might
not be 100% complete, but it seems to work with the vast majority
of the sources in the tree.

Change-Id: I2a899ebc8b35b8d024cc3499539489cca0127606
2012-02-27 13:29:10 -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
Mathias Agopian
a3b1c78767 remove dependency on android_natives_priv.h
Change-Id: If06ea9aeb836d6ceb09745770956a25211f428d3
2012-02-24 18:04:51 -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
85a3dd914e am 1e40e843: am ee87007e: Reconcile with ics-mr1-release
* commit '1e40e8433d783e4f06be1fb4029fdceca1e7ad6a':
2012-02-24 14:11:35 -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
784b6b74df am 56174149: am 05d10ed4: Reconcile with ics-mr1-release
* commit '561741493b4f99135dd840c7f1da15a2199a4775':
2012-02-24 14:01:54 -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
2db4ff57d5 am 23abe1ec: am f5229261: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
* commit '23abe1ec1fff3e0e8242aa842865f691ac73040b':
2012-02-24 12:13:46 -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
f3c068c79a am bcd311ce: am 9cb15c9e: am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1
* commit 'bcd311ce0b17d892f87d2e31741dc1873491d20f':
  EmuGL: GLESv2 support for OES_EGL_image_external
2012-02-24 12:11:52 -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
372ca7fd9d am 99c486f8: (-s ours) am c85a73bf: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge.
* commit '99c486f88faa71b51eff171c46043d7aef54d44a':
2012-02-23 18:16:27 -08:00
Tor Norbye
a9400477e7 am 1c0deccd: (-s ours) am 9ce81e38: am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge.
* commit '1c0deccda983acb97fdcc843f87aab00abdc4e30':
  Fix version metadata for java.lang.reflect.Field. do not merge.
2012-02-23 18:14:22 -08:00