Commit Graph

8988 Commits

Author SHA1 Message Date
Jesse Hall
43a5b2b538 am 1beba231: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp
* commit '1beba23120a914aa02aa18569de0c06818bf5d09':
2012-03-07 17:22:11 -08:00
Jesse Hall
e6ab388b7d am de9127c6: am cbd446a9: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
* commit 'de9127c6b37bcc40c5d60a1b8b8588847ec986d1':
  Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 17:22:10 -08:00
Jesse Hall
e4e4e59883 am 1d6ccdfa: am 1f4f50c7: am 767d0894: Delete dead code.
* commit '1d6ccdfacbecd977c038817b6cfff3a7f9e45c01':
  Delete dead code.
2012-03-07 17:22:09 -08:00
Dirk Dougherty
722e3231fb am 3c7dc0f4: am 3007c3f5: am 9ba4ba70: Doc change: string changes for Google Play
* commit '3c7dc0f4053abe5cdf8098d92f9beb22cc6f9bee':
2012-03-07 16:48:23 -08:00
Dirk Dougherty
1d7bba6b6f resolved conflicts for merge of b7c3c566 to master
Change-Id: Ibd84692dc7f851b4389427ec2b504c4201e221b3
2012-03-07 16:44:43 -08:00
Raphael Moll
482423c8a9 Merge "SDK repo: fix to handle new and old xsd for support lib" 2012-03-07 15:04:14 -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
Jesse Hall
a308d5ff8e Merge "Add/fix copyright notices" 2012-03-07 07:24:21 -08:00
Jesse Hall
8dfb93bc2b Merge "Work around a y-invert bug on Macs w/ Intel GPU" 2012-03-06 18:14:24 -08:00
Jesse Hall
2dd25e2e9b Merge "Delete dead code." 2012-03-06 18:14:08 -08:00
Jesse Hall
f4a20e58aa Add/fix copyright notices
Several EmuGL files were missing copyright notices; added them. Others
had them but below other code, which makes checking for them more
difficult -- I moved these to the top of the file.

These files were all created by GraphTech as a work for hire for AOSP.

Change-Id: Iee67bcf1c9b54ad5aa8a9288ded0382a974c32cb
2012-03-06 16:13:03 -08:00
Jesse Hall
2478dfd351 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-06 16:09:06 -08:00
Jesse Hall
54934b06f1 Delete dead code.
Change-Id: I5b87fac4e2140a903221a1f68b16fa6a96e5effc
2012-03-06 16:09:06 -08:00
Xavier Ducrohet
1330a44b49 Merge "Add the new v7 support library project to the SDK." 2012-03-06 15:25:40 -08:00
Xavier Ducrohet
7942a69488 Add the new v7 support library project to the SDK.
Change-Id: If9078f71e369bae3dd4a0e89ddd792bbfef09fbb
2012-03-06 15:14:05 -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
Shih-wei Liao
eb2a72d963 Merge "Rename resource drawable to drawable-nodpi for RsStates." 2012-03-05 10:37:38 -08:00
Bill Napier
339fa32291 Merge "Fix UNKNOWN keycode parsing in monkey." 2012-03-05 09:49:27 -08:00
Shih-wei Liao
d3ed0458e4 Rename resource drawable to drawable-nodpi for RsStates.
Otherwise, we'll have the power of 2 cube faces problem.
The issue was first reported by yong.a.chen@intel.com.

Change-Id: I1b2fa9d261e42b2f962ea29f690d5624a883574c
2012-03-05 08:38:01 -08:00
Dirk Dougherty
9ba4ba7094 Doc change: string changes for Google Play
Change-Id: I39acdc4faae23a43d39c2e2976543a946bd656af
2012-03-04 20:54:23 -08:00
Nick Kralevich
c622a9dd84 Merge "remove HAL_MODULE_INFO_SYM const" 2012-03-02 08:29:36 -08:00
Nick Kralevich
c7f0d89684 remove HAL_MODULE_INFO_SYM const
HAL_MODULE_INFO_SYM was declared as read-only, but
the struct is written to by libhardware.  This causes
a segfault when -Wl,-z,relro is enabled.

Fixed.

Change-Id: I3a3e8366bc2468aef75a3480edd0b3e8fcfeafa5
2012-03-01 17:06:37 -08:00
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