Commit Graph

7288 Commits

Author SHA1 Message Date
David 'Digit' Turner
26f4ec6044 am 6b44056d: am 6e837041: am 09d3d318: am c13e5c1c: Merge "ndk: Fix android-3/arch-arm crt{begin,end}_so.o"
* commit '6b44056dcffed6ac23140969b60257fdfd82b1ac':
  ndk: Fix android-3/arch-arm crt{begin,end}_so.o
2011-07-15 11:20:57 -07:00
David 'Digit' Turner
04a343244f am ecab2abe: am 0663014f: am 75266abb: am 0db3eb4a: Merge "ndk: Add crtbegin_so.o / crtend_so.o to android-3"
* commit 'ecab2abe5ed7aa2696aae08a7678a982ffcc9347':
  ndk: Add crtbegin_so.o / crtend_so.o to android-3
2011-07-15 11:20:54 -07:00
David 'Digit' Turner
6b44056dcf am 6e837041: am 09d3d318: am c13e5c1c: Merge "ndk: Fix android-3/arch-arm crt{begin,end}_so.o"
* commit '6e83704102ef91e3e8d217be2b8906a746c54d9a':
  ndk: Fix android-3/arch-arm crt{begin,end}_so.o
2011-07-15 10:47:20 -07:00
David 'Digit' Turner
ecab2abe5e am 0663014f: am 75266abb: am 0db3eb4a: Merge "ndk: Add crtbegin_so.o / crtend_so.o to android-3"
* commit '0663014fef1f9f7b44386a5f6fde97bd8fe9e452':
  ndk: Add crtbegin_so.o / crtend_so.o to android-3
2011-07-15 10:47:16 -07:00
Svetoslav Ganov
67da55d23e Merge "Adding ActionProvider demo." 2011-07-14 18:04:26 -07:00
Svetoslav Ganov
ddece2d84d Adding ActionProvider demo.
Change-Id: If0f540cd796ced27f392f1c31d20ab5ab34e5c3e
2011-07-14 18:00:14 -07:00
Yu Shan Emily Lau
8dda250aff Merge "Add the Tap duration in the scripted monkey." 2011-07-14 17:17:04 -07:00
Yu Shan Emily Lau
921d82fcdc Add the Tap duration in the scripted monkey.
Change-Id: Ie18872f6ab7934458f45fb2ac573a90a2c12319a
2011-07-14 16:59:45 -07:00
Xavier Ducrohet
db5ac391d6 Merge "Add WSVGA skin to represent 7" tablets." 2011-07-14 16:28:39 -07:00
David Turner
7a88cc163b am 68635c83: am a0def8c5: am 7a18bbb8: am 9e5560f7: Merge "2.0 Translator:GL_INVALID_VALUE on bad program/shader"
* commit '68635c83c42926c353680ec4f66a7dc2293c39e8':
  2.0 Translator:GL_INVALID_VALUE on bad program/shader
2011-07-14 10:56:30 -07:00
David Turner
a6dfa8e10e am 7d024bfa: am 615c690d: am 1905302f: am c97bc443: Merge "Fix parameter parsing in renderer"
* commit '7d024bfa12b4ce37d7a80ac57b7736004ac4f0a1':
  Fix parameter parsing in renderer
2011-07-14 10:56:28 -07:00
David Turner
0dc7321298 am cd043598: am a2f79a51: am 5e33e434: am b26d94c5: Merge "opengles Translator: DrawTex impl - don\'t draw if no textures enabled."
* commit 'cd04359820e6f1b054e4f0b4d4dec8c735076318':
  opengles Translator: DrawTex impl - don't draw if no textures enabled.
2011-07-14 10:56:25 -07:00
David Turner
f9ca09bb33 am 1b62b1f4: am e4a7a79b: am c49de351: am 98030a4f: Merge "2.0 translator: support ARB_ES2_compatibility stuff"
* commit '1b62b1f463bfc76edb30e7026ef9779f9aaa61ae':
  2.0 translator: support ARB_ES2_compatibility stuff
2011-07-14 10:56:23 -07:00
David Turner
72e8af0046 am 7f7ae08d: am b08fd409: am c9ad449f: am cea49c2f: Merge "translator EGL:fixing bug in eglGetDisplay caused in Windows Platform"
* commit '7f7ae08d19939f46f9487d381bb96d966609320e':
  translator EGL:fixing bug in eglGetDisplay caused in Windows Platform
2011-07-14 10:56:21 -07:00
David Turner
91c6653030 am 46f62cdc: am e2b9bd38: am 67984d2d: am a99be30d: Merge "opengles Translator: get Compressed texture handling out from GLEScontext"
* commit '46f62cdca1397bd6957365e8c4c8f1c99b19c2cc':
  opengles Translator: get Compressed texture handling out from GLEScontext
2011-07-14 10:56:18 -07:00
David Turner
acf3a2d08e am 2a35102a: am 72e117b6: am b2de740a: am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D"
* commit '2a35102a6e73a01675bde7ff24d91ce5ab38c1a0':
  opengles emulator: support for null in data parameter of glCompressedTexImage2D
2011-07-14 10:56:15 -07:00
David Turner
4bc9daedf7 am 922d5aa9: am 1d01f3d2: am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)"
* commit '922d5aa97cd7a5ba7cb164c34e1974330edfd5e7':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)
2011-07-14 10:56:11 -07:00
David Turner
223bdd1766 am 288151c6: am 067426e0: am 0fecb41c: am 7be5b706: Merge "emulator:opengl: input event redirection"
* commit '288151c64eca5b357c0578eb0e9f9769d2cd9c6d':
  emulator:opengl: input event redirection
2011-07-14 10:49:18 -07:00
David Turner
2e2e571cd6 am 86c57cf4: am dd70f991: am c1c47c08: am 6a9aa82f: Merge "emulator:opengl: custom framebuffer sizes"
* commit '86c57cf449958934400ad5794df9543f81760e21':
  emulator:opengl: custom framebuffer sizes
2011-07-14 10:49:14 -07:00
Xavier Ducrohet
dc8ff0c787 Add WSVGA skin to represent 7" tablets.
Change-Id: I0b2865e2213839265f6acf8e9e324fa7018cf336
2011-07-14 10:42:59 -07:00
David Turner
68635c83c4 am a0def8c5: am 7a18bbb8: am 9e5560f7: Merge "2.0 Translator:GL_INVALID_VALUE on bad program/shader"
* commit 'a0def8c552f07c8db25a5c13b7a23278ad71d076':
  2.0 Translator:GL_INVALID_VALUE on bad program/shader
2011-07-14 09:18:27 -07:00
David Turner
7d024bfa12 am 615c690d: am 1905302f: am c97bc443: Merge "Fix parameter parsing in renderer"
* commit '615c690d0f99eb10ca5c66c8fdd839a354063fb5':
  Fix parameter parsing in renderer
2011-07-14 09:18:25 -07:00
David Turner
cd04359820 am a2f79a51: am 5e33e434: am b26d94c5: Merge "opengles Translator: DrawTex impl - don\'t draw if no textures enabled."
* commit 'a2f79a51564c5a299ec1727c2639e57c30d8ddfd':
  opengles Translator: DrawTex impl - don't draw if no textures enabled.
2011-07-14 09:18:22 -07:00
David Turner
1b62b1f463 am e4a7a79b: am c49de351: am 98030a4f: Merge "2.0 translator: support ARB_ES2_compatibility stuff"
* commit 'e4a7a79bb6d66cec9189839057f448af14236f05':
  2.0 translator: support ARB_ES2_compatibility stuff
2011-07-14 09:18:20 -07:00
David Turner
7f7ae08d19 am b08fd409: am c9ad449f: am cea49c2f: Merge "translator EGL:fixing bug in eglGetDisplay caused in Windows Platform"
* commit 'b08fd409f7a8b04c18733012b0d919bb1cf06d71':
  translator EGL:fixing bug in eglGetDisplay caused in Windows Platform
2011-07-14 09:18:17 -07:00
David Turner
46f62cdca1 am e2b9bd38: am 67984d2d: am a99be30d: Merge "opengles Translator: get Compressed texture handling out from GLEScontext"
* commit 'e2b9bd38df22a4c364c9c34c7ba6308763a2de66':
  opengles Translator: get Compressed texture handling out from GLEScontext
2011-07-14 09:18:13 -07:00
David Turner
2a35102a6e am 72e117b6: am b2de740a: am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D"
* commit '72e117b6022d79b90609c5cb13c7a462b167281d':
  opengles emulator: support for null in data parameter of glCompressedTexImage2D
2011-07-14 09:18:10 -07:00
David Turner
922d5aa97c am 1d01f3d2: am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)"
* commit '1d01f3d2958cfc85abbeb5e835fcabb40125b461':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)
2011-07-14 09:18:06 -07:00
David 'Digit' Turner
6e83704102 am 09d3d318: am c13e5c1c: Merge "ndk: Fix android-3/arch-arm crt{begin,end}_so.o"
* commit '09d3d31876ed4bf9e2afebad0c5a9f2600af54c2':
  ndk: Fix android-3/arch-arm crt{begin,end}_so.o
2011-07-14 00:20:29 -07:00
David 'Digit' Turner
09d3d31876 am c13e5c1c: Merge "ndk: Fix android-3/arch-arm crt{begin,end}_so.o"
* commit 'c13e5c1cd44a3073caf33c4f043a9474530a0d7d':
  ndk: Fix android-3/arch-arm crt{begin,end}_so.o
2011-07-14 00:18:57 -07:00
David 'Digit' Turner
c13e5c1cd4 Merge "ndk: Fix android-3/arch-arm crt{begin,end}_so.o" 2011-07-14 00:14:00 -07:00
David 'Digit' Turner
a062ad61b0 ndk: Fix android-3/arch-arm crt{begin,end}_so.o
Turns out that the previously commited versions of these files do not
allow for proper linking with a patched toolchain. With -shared, gcc complains
that:

    .preinit_array section is not allowed in DSO

So use the versions from android-9/arch-arm instead, which seems to work fine.

Change-Id: I9aeaab449ddad058451c7d6493c983ab2ed1c4eb
2011-07-14 08:15:16 +02:00
David 'Digit' Turner
0663014fef am 75266abb: am 0db3eb4a: Merge "ndk: Add crtbegin_so.o / crtend_so.o to android-3"
* commit '75266abb765530ea008801850aca413fb1fc7b87':
  ndk: Add crtbegin_so.o / crtend_so.o to android-3
2011-07-13 22:44:25 -07:00
David 'Digit' Turner
75266abb76 am 0db3eb4a: Merge "ndk: Add crtbegin_so.o / crtend_so.o to android-3"
* commit '0db3eb4adba6df89be6cde96620d5a85c89abb4b':
  ndk: Add crtbegin_so.o / crtend_so.o to android-3
2011-07-13 22:41:31 -07:00
David 'Digit' Turner
0db3eb4adb Merge "ndk: Add crtbegin_so.o / crtend_so.o to android-3" 2011-07-13 22:27:24 -07:00
David 'Digit' Turner
75cedfadcd ndk: Add crtbegin_so.o / crtend_so.o to android-3
This change adds crtbegin_so.o and crtend_so.o under
platforms/android-3/arch-arm/lib.

This is in preparation of another toolchain patch that will require
these files for all platform versions (for now, they are only defined
starting from android-9).

Note that these files are just copies of the existing ones, named
crtbegin_dynamic.o and crtend_android.o respectively.

The NDK build script will automatically use the new files if it finds
them, so shouldn't need to be updated.

Change-Id: I6a446266b54b871cd957dfd737054b302678b2d3
2011-07-14 05:51:31 +02:00
David Turner
a0def8c552 am 7a18bbb8: am 9e5560f7: Merge "2.0 Translator:GL_INVALID_VALUE on bad program/shader"
* commit '7a18bbb8a6d77e2b743cdd8d24f94b3ea26f8918':
  2.0 Translator:GL_INVALID_VALUE on bad program/shader
2011-07-13 18:18:45 -07:00
David Turner
615c690d0f am 1905302f: am c97bc443: Merge "Fix parameter parsing in renderer"
* commit '1905302f5345257688d156eb6a08c8054fe96271':
  Fix parameter parsing in renderer
2011-07-13 18:18:43 -07:00
David Turner
a2f79a5156 am 5e33e434: am b26d94c5: Merge "opengles Translator: DrawTex impl - don\'t draw if no textures enabled."
* commit '5e33e4348ff9aeae482f47c5256eb6df59c9b878':
  opengles Translator: DrawTex impl - don't draw if no textures enabled.
2011-07-13 18:18:41 -07:00
David Turner
e4a7a79bb6 am c49de351: am 98030a4f: Merge "2.0 translator: support ARB_ES2_compatibility stuff"
* commit 'c49de351cb118e0f8dd4df6f4e3f46b8ec1d42ac':
  2.0 translator: support ARB_ES2_compatibility stuff
2011-07-13 18:18:39 -07:00
David Turner
b08fd409f7 am c9ad449f: am cea49c2f: Merge "translator EGL:fixing bug in eglGetDisplay caused in Windows Platform"
* commit 'c9ad449f633fbbef0b46f2617bd75d80db1d8942':
  translator EGL:fixing bug in eglGetDisplay caused in Windows Platform
2011-07-13 18:18:37 -07:00
David Turner
e2b9bd38df am 67984d2d: am a99be30d: Merge "opengles Translator: get Compressed texture handling out from GLEScontext"
* commit '67984d2d4ba35018d0f832301aaaab12d7949a78':
  opengles Translator: get Compressed texture handling out from GLEScontext
2011-07-13 18:18:34 -07:00
David Turner
7a18bbb8a6 am 9e5560f7: Merge "2.0 Translator:GL_INVALID_VALUE on bad program/shader"
* commit '9e5560f7ee7d0c208191a15450c62cedf5d6efd5':
  2.0 Translator:GL_INVALID_VALUE on bad program/shader
2011-07-13 18:16:51 -07:00
David Turner
1905302f53 am c97bc443: Merge "Fix parameter parsing in renderer"
* commit 'c97bc443642a4fd9f4d275a1e74d341c56ef45d7':
  Fix parameter parsing in renderer
2011-07-13 18:16:49 -07:00
David Turner
5e33e4348f am b26d94c5: Merge "opengles Translator: DrawTex impl - don\'t draw if no textures enabled."
* commit 'b26d94c5a0c8398331d9d5bda43b22b724638201':
  opengles Translator: DrawTex impl - don't draw if no textures enabled.
2011-07-13 18:16:47 -07:00
David Turner
c49de351cb am 98030a4f: Merge "2.0 translator: support ARB_ES2_compatibility stuff"
* commit '98030a4f20ec3ec7dbeda20d8cb7e27b0c433ca6':
  2.0 translator: support ARB_ES2_compatibility stuff
2011-07-13 18:16:45 -07:00
David Turner
c9ad449f63 am cea49c2f: Merge "translator EGL:fixing bug in eglGetDisplay caused in Windows Platform"
* commit 'cea49c2ff236ada13f5c3983f76ecd36dcea2667':
  translator EGL:fixing bug in eglGetDisplay caused in Windows Platform
2011-07-13 18:16:42 -07:00
David Turner
67984d2d4b am a99be30d: Merge "opengles Translator: get Compressed texture handling out from GLEScontext"
* commit 'a99be30d60ab0902b856502334a9c363b432b3bd':
  opengles Translator: get Compressed texture handling out from GLEScontext
2011-07-13 18:16:40 -07:00
David Turner
9e5560f7ee Merge "2.0 Translator:GL_INVALID_VALUE on bad program/shader" 2011-07-13 18:08:06 -07:00
David Turner
c97bc44364 Merge "Fix parameter parsing in renderer" 2011-07-13 18:07:53 -07:00