Commit Graph

7990 Commits

Author SHA1 Message Date
Liran
31b99df283 GLES translator - enable binding to multiple texture targets
support different binding to GL_TEXTURE_2D and GL_TEXTURE_CUBE_MAP
targets

create 2 default texture object, to be bound when BindTexture( ... ,0)
is called.
in order to do this, we must ensure their names are internal only, so the user can't
use these names by accident.
the object name manager local name is now 64 bit to allow generation of internal names

Change-Id: I29d000a67042051706e13dc3ef3aa34a1a24f8ca
2011-07-27 15:19:10 +03:00
Liran
3c457bda2f GLES2 translaotr: fix glLinkProgram and object names
Do not allow glLinkProgram to succeed if only one shader type has been
attached to the program, GL allows this, but GLES2 does not.
added state tracking for program objects to check which shaders are
attached to the program object.

add a way to define object data type being held for each object in objectNameManager
ProgramData and ShaderParser are both valid objectData for objects in SHADER namespace
we need a way to determine object type to generate correct errors

Change-Id: Ic232549df0bb6daf6ec528cb039482cd68e896bb
2011-07-27 15:19:04 +03:00
Makoto Onuki
b2ebc5c6ce Merge "Support new intent INVITE_CONTACT introduced in v14" 2011-07-26 15:15:47 -07:00
Makoto Onuki
23e15c5d41 Support new intent INVITE_CONTACT introduced in v14
SampleSyncAdapter uses INVITE_CONTACT to add a raw contact to an existing
contact.

INVITE_CONTACT is treated in the save way as ACTION_INSERT, except:
- The incoming intent won't have the account extra, so always use the first
  account found.
- The name field will be prepopulated with the display name of the passed
  account.

Bug 5061956

Change-Id: Ica1263fe54150dbc0e79389ebdf2a0e748a7c840
2011-07-26 14:47:07 -07:00
Flavio Lerda
a8b0f95cb4 Merge "A few fixes for Eclipse classpath file." 2011-07-26 13:45:19 -07:00
Flavio Lerda
fc74f9ef9e A few fixes for Eclipse classpath file.
- Remove a couple of non-existing projects.
- Add frameworks/ex/variablespeed.

Change-Id: I1969906ad2a64a3c735d4aba12bfebae0f002003
2011-07-26 21:23:29 +01:00
Jason Sams
6b63b54036 Merge "Fix sample to use API 14." 2011-07-26 12:19:21 -07:00
Romain Guy
c35d058e8d Add new API demos for fragment custom animations.
Change-Id: Ia4339d4e4c1617907a9c707e1b8c2309b303e267
2011-07-25 16:29:00 -07:00
Hugo Hudson
35cf07a3ed Add the variable speed tests to the test runner.
- You can now run the tests with runtest ex-variablespeed.

Bug: 5048257
Change-Id: I535c0aa91e2b4a4209ae8c4da39cb8fa9e746182
2011-07-26 00:18:34 +01:00
Amith Yamasani
ea5c0b0f87 New SearchView expansion using ActionBar feature.
Change-Id: Ib0a4bdc45af65fdeeb354ee02de02b251fec471d
2011-07-25 13:17:05 -07:00
Romain Guy
2d7bd93c82 This tool is no longer required
Change-Id: I4738464d5eaa1c8a8f0619c1405efc726fd1a30a
2011-07-21 18:05:24 -07:00
Jason Sams
16f8525aaf Fix sample to use API 14.
Change-Id: Iba9cb731a80f32972d61b8d7e55b4881cb81d36c
2011-07-21 17:22:40 -07:00
Bill Napier
0693bdd8d2 Merge "Added view introspection functionality to Monkey" 2011-07-21 10:38:47 -07:00
Jeff Hamilton
7e44b256ef Merge "Fix crashes when NFC isn't supported." 2011-07-20 21:53:09 -07:00
Jeff Hamilton
9d7ed78e7a Fix crashes when NFC isn't supported.
Change-Id: I638a1e4e5d7a0b5d4f84668e134b13457aeaa879
2011-07-20 23:22:00 -05:00
Romain Guy
a1cb462b69 Merge "Convert looper traces to traceview traces" 2011-07-20 18:47:56 -07:00
Romain Guy
3cb68797bc Convert looper traces to traceview traces
Change-Id: I378bab7d076ab43699d08809e58eb5a478488c74
2011-07-20 18:46:31 -07:00
Marco Nelissen
7d421c5b02 Update findunusedresources to know about integers and mipmaps
Change-Id: I10846ae4f876a325ce53e2c1522af2094493beba
2011-07-20 14:48:43 -07:00
Michael Wright
c6c89b994e Added deferreturn command
Change-Id: Id84ac667d42dab4648b24cc335917c3d15ec1de4
2011-07-20 14:27:10 -07:00
Michael Wright
b36bed5899 Added view introspection functionality to Monkey
Change-Id: Ica8439d8c5694dc6ecc5c64d8ce52d16f51cbb25
2011-07-20 14:21:04 -07:00
David Hu
345110054e Merge "Move ConnectivityTest apk to the sdk directory" 2011-07-20 11:56:37 -07:00
David Hu
7089a5a237 Move ConnectivityTest apk to the sdk directory
Change-Id: I7b28f5edc17ade8c80d123b10f38f96bfe6aaec0
2011-07-19 18:51:49 -07:00
Svetoslav Ganov
116d35bd9b Merge "Fixing the action provider demo" 2011-07-19 13:57:43 -07:00
Svetoslav Ganov
575c0c3e5c Fixing the action provider demo
1. Fixed a bug the the way the URI was set to the
   intent.

2. Added code to copy a private raw resource to a
   publicly readable file that is to be shared.

Change-Id: Ib7ee172b2a4a890ce77911d0ef1c3ea3b24e69c9
2011-07-19 13:19:47 -07:00
Xavier Ducrohet
b94c16ad8a Merge "Update skin list." 2011-07-18 18:10:14 -07:00
Alex Sakhartchouk
22309b8f9d Merge "fix the function pointer table" 2011-07-18 13:43:28 -07:00
Brett Chabot
1213665dee Merge "Fix runtest --path for tests built against SDK." 2011-07-18 12:08:11 -07:00
Xavier Ducrohet
80770d5bc4 Update skin list.
Change-Id: Ic6f128f2ebc69a0cf639ccbe5c6c464375c8201c
2011-07-18 11:44:36 -07:00
Brett Chabot
1c25c46318 Merge "Build all samples against SDK." 2011-07-17 14:37:32 -07:00
Brett Chabot
ecfcc7da8e Fix runtest --path for tests built against SDK.
Bug 4556556

Change-Id: I3f829cae8f9fc1e64b3a44ac9e306b13b3cead7c
2011-07-17 14:06:20 -07:00
Brett Chabot
e2e7ec9429 Build all samples against SDK.
Change-Id: I9ea35c07a7f9d2e2a42d952101e99528fd68fb6c
2011-07-15 17:31:33 -07:00
David 'Digit' Turner
e8ceb3f0b6 am 16a7447e: am d681f257: am bb2c6132: am 718e8b89: Merge "ndk: arm: also update other CRT runtime objects."
* commit '16a7447e3f2ee49dc23729fb20a3077d37fd2440':
  ndk: arm: also update other CRT runtime objects.
2011-07-15 14:12:19 -07:00
David Turner
f96c3a6ecf am 9f542f16: am ecf66769: am 682f9143: am e6c1178e: Merge "use Translator\'s glTexImage2D in doCompressedTexImage2D"
* commit '9f542f16e6b4ca6682839ec545374ddfbcf748f8':
  use Translator's glTexImage2D in doCompressedTexImage2D
2011-07-15 14:12:08 -07:00
David Turner
cbb00cd61d am 3f2120a6: am d6d5ed98: am b3dbf9b0: am 02acec79: Merge "emulator:opengl: fix windows build"
* commit '3f2120a6fa2c491dd84b93b48e0f12e7709ef2f2':
  emulator:opengl: fix windows build
2011-07-15 14:12:06 -07:00
Romain Guy
845bd9e1cb Merge "Add simple tool to process and display looper traces." 2011-07-15 13:57:22 -07:00
Romain Guy
269adda773 Add simple tool to process and display looper traces.
Change-Id: I67a96fbe6b9688ac9f56dc81d3c45730829507a6
2011-07-15 13:56:48 -07:00
David 'Digit' Turner
16a7447e3f am d681f257: am bb2c6132: am 718e8b89: Merge "ndk: arm: also update other CRT runtime objects."
* commit 'd681f257aa47dc643db5222796e9a2ce7ed42437':
  ndk: arm: also update other CRT runtime objects.
2011-07-15 11:21:55 -07:00
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 Turner
9f542f16e6 am ecf66769: am 682f9143: am e6c1178e: Merge "use Translator\'s glTexImage2D in doCompressedTexImage2D"
* commit 'ecf6676949865f7c8a381f4c2e08c3c898726573':
  use Translator's glTexImage2D in doCompressedTexImage2D
2011-07-15 11:16:55 -07:00
David Turner
3f2120a6fa am d6d5ed98: am b3dbf9b0: am 02acec79: Merge "emulator:opengl: fix windows build"
* commit 'd6d5ed989e75c7cc3bc9ad2a14304133394bb9f1':
  emulator:opengl: fix windows build
2011-07-15 11:16:53 -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
David 'Digit' Turner
d681f257aa am bb2c6132: am 718e8b89: Merge "ndk: arm: also update other CRT runtime objects."
* commit 'bb2c613289f6914cc536119d155ed4ea3b2a1847':
  ndk: arm: also update other CRT runtime objects.
2011-07-14 20:38:01 -07:00
David 'Digit' Turner
bb2c613289 am 718e8b89: Merge "ndk: arm: also update other CRT runtime objects."
* commit '718e8b89209cfdaed2adc756737a51683d24a861':
  ndk: arm: also update other CRT runtime objects.
2011-07-14 20:36:26 -07:00
David 'Digit' Turner
718e8b8920 Merge "ndk: arm: also update other CRT runtime objects." 2011-07-14 20:23:32 -07:00
David 'Digit' Turner
cd181903b5 ndk: arm: also update other CRT runtime objects.
Turns out that updating crtbegin_so.o and crend_so.o is not
enough for the standalone toolchain. We also need to update
the object files used to generate static and dynamic
executables.

This fixes the standalone toolchain NDK tests.

Change-Id: Ibf113b09766f00b30895951a5639343728be3f3a
2011-07-15 05:21:36 +02: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