David Turner
8898d5da70
am 675845a4: am ecf74d6a: am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"
...
* commit '675845a4d26c8d718fa3c5a6b53b873c9ae01fc2':
GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
2011-08-03 17:42:39 -07:00
David Turner
e70dc86f13
am fa00fd7e: am dedcb460: am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""
...
* commit 'fa00fd7e18dcc15543fd2f12fb2b67c98b84b79c':
2.0 translator: workaround for nVidia "bug"
2011-08-03 17:42:37 -07:00
David Turner
237eb01363
am 42f7afd1: am 90b89c58: am 1cd64c70: Merge "GLES2 translator: host does not support RGB565"
...
* commit '42f7afd1c7db902d57525f09b6f26701b13cde90':
GLES2 translator: host does not support RGB565
2011-08-03 17:42:34 -07:00
David Turner
bf2a74e70c
am 3e06a6c4: am 4045962c: am bcfc7b17: Merge "GLES translator - enable binding to multiple texture targets"
...
* commit '3e06a6c4dbafa0f2e2542a2b6175324f218ffa48':
GLES translator - enable binding to multiple texture targets
2011-08-03 17:42:31 -07:00
David Turner
05e78badcc
am 51fa07e1: am 659943e8: am 0c1ce6de: Merge "GLES2 translaotr: fix glLinkProgram and object names"
...
* commit '51fa07e1dad4c5407c739df71e3e4c8cf8c56e4b':
GLES2 translaotr: fix glLinkProgram and object names
2011-08-03 17:42:27 -07:00
Mark D Horn
36f0d56517
Fix size_t definition in x86 NDK header file
...
Bug: http://code.google.com/p/android/issues/detail?id=19011
The incorrect #define was being used which caused the incorrect
definition for size_t when the standalone toolchain is used.
Change-Id: Ifef4dc987c542a9c5d8bb43d84d3fe1431de9aa0
Signed-off-by: Mark D Horn <mark.d.horn@intel.com >
2011-08-03 15:11:56 -07:00
Xavier Ducrohet
e4354ba71e
resolved conflicts for merge of d2819621 to honeycomb-plus-aosp
...
Change-Id: I2c84ffb40bd1db769b9ce271206c3b680a4e3179
2011-08-03 13:47:37 -07:00
Vladimir Chtchetkine
dc6e4e64de
am af0d8ed8: am 9a528ed9: Merge "Get rid of libqemu library."
...
* commit 'af0d8ed819cf5eaf9b77bde80c0ef87a9d690d5d':
Get rid of libqemu library.
2011-08-03 12:44:08 -07:00
Xavier Ducrohet
d281962194
am c6d3e76d: Merge "move platform tools to r8."
...
* commit 'c6d3e76d5d6112a66c04f9e2fe6c2d610ee8702b':
move platform tools to r8.
2011-08-03 12:42:13 -07:00
Vladimir Chtchetkine
af0d8ed819
am 9a528ed9: Merge "Get rid of libqemu library."
...
* commit '9a528ed9845694e8fb73d263145786a6f549240d':
Get rid of libqemu library.
2011-08-03 12:42:10 -07:00
Xavier Ducrohet
c6d3e76d5d
Merge "move platform tools to r8."
2011-08-03 11:04:13 -07:00
Xavier Ducrohet
776387aa8f
Merge "Add all platform fonts to the SDK."
2011-08-03 11:03:41 -07:00
Vladimir Chtchetkine
9a528ed984
Merge "Get rid of libqemu library."
2011-08-03 10:51:07 -07:00
Vladimir Chtchetkine
b2b6f2f9da
Get rid of libqemu library.
...
Its implementation has been inlined in hardware/libhardware/include/hardware/qemu_pipe.h
Change-Id: I355764f87047c915ac43b85cd18bf0f27f06ede3
2011-08-03 09:10:14 -07:00
David Turner
675845a4d2
am ecf74d6a: am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"
...
* commit 'ecf74d6a25a9b4b93c22f2702b703d5e41acc81c':
GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
2011-08-03 06:53:57 -07:00
David Turner
fa00fd7e18
am dedcb460: am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""
...
* commit 'dedcb46019fae19d5f81f6924025e5ba54a1ec20':
2.0 translator: workaround for nVidia "bug"
2011-08-03 06:53:55 -07:00
David Turner
42f7afd1c7
am 90b89c58: am 1cd64c70: Merge "GLES2 translator: host does not support RGB565"
...
* commit '90b89c58a481b6eaef784181b03e213820e2824a':
GLES2 translator: host does not support RGB565
2011-08-03 06:53:52 -07:00
David Turner
3e06a6c4db
am 4045962c: am bcfc7b17: Merge "GLES translator - enable binding to multiple texture targets"
...
* commit '4045962cca6f7b9f5a5f55197b62ad2332f479a7':
GLES translator - enable binding to multiple texture targets
2011-08-03 06:53:50 -07:00
David Turner
51fa07e1da
am 659943e8: am 0c1ce6de: Merge "GLES2 translaotr: fix glLinkProgram and object names"
...
* commit '659943e8a6001d8008005f1cbae738025854cfcc':
GLES2 translaotr: fix glLinkProgram and object names
2011-08-03 06:53:47 -07:00
David Turner
ecf74d6a25
am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"
...
* commit '47706d40ab7ceaac975bd7859258d8b4d5bc6c4a':
GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
2011-08-03 06:50:31 -07:00
David Turner
dedcb46019
am 6707ea95: Merge "2.0 translator: workaround for nVidia "bug""
...
* commit '6707ea95bad94909787d56e8d855c9c45100e6ad':
2.0 translator: workaround for nVidia "bug"
2011-08-03 06:50:29 -07:00
David Turner
90b89c58a4
am 1cd64c70: Merge "GLES2 translator: host does not support RGB565"
...
* commit '1cd64c705cf8bbd9d6a6efdfa3daa593d066d1b8':
GLES2 translator: host does not support RGB565
2011-08-03 06:50:27 -07:00
David Turner
4045962cca
am bcfc7b17: Merge "GLES translator - enable binding to multiple texture targets"
...
* commit 'bcfc7b17a0bd7feb90ab0c240864b6e1a5385f56':
GLES translator - enable binding to multiple texture targets
2011-08-03 06:50:25 -07:00
David Turner
659943e8a6
am 0c1ce6de: Merge "GLES2 translaotr: fix glLinkProgram and object names"
...
* commit '0c1ce6de3b7815ff85afed110c2040e52ad609c5':
GLES2 translaotr: fix glLinkProgram and object names
2011-08-03 06:50:22 -07:00
David Turner
47706d40ab
Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"
2011-08-03 06:40:59 -07:00
David Turner
6707ea95ba
Merge "2.0 translator: workaround for nVidia "bug""
2011-08-03 06:40:06 -07:00
David Turner
1cd64c705c
Merge "GLES2 translator: host does not support RGB565"
2011-08-03 06:39:06 -07:00
David Turner
bcfc7b17a0
Merge "GLES translator - enable binding to multiple texture targets"
2011-08-03 06:38:17 -07:00
David Turner
0c1ce6de3b
Merge "GLES2 translaotr: fix glLinkProgram and object names"
2011-08-03 06:37:29 -07:00
Xavier Ducrohet
0433962f67
Add all platform fonts to the SDK.
...
Change-Id: Ie73bcb0769313db601466ae5d01416ee7b429353
2011-08-02 18:36:13 -07:00
Xavier Ducrohet
b7968a9871
move platform tools to r8.
...
Change-Id: I6ac8606db6721313af92241cf8bbe71175c0a705
2011-08-02 18:14:32 -07:00
Stephen Hines
991ee9950d
Merge "Remove Runtime exit() function from Balls app."
2011-08-02 17:18:22 -07:00
Stephen Hines
e036a5f1cb
Remove Runtime exit() function from Balls app.
...
This prevents a nasty teardown bug that was causing segfaults during atexit().
It is more than sufficient to call onStop() in this case to properly release
all resources.
Change-Id: If9ea892074382f9ea194da3d75771aae3b529053
2011-08-02 17:11:34 -07:00
David Hu
518aa9cde8
GPS Location Test Build Change
...
move the GpsLocationTest.apk to the emulator-test-apps directory
Change-Id: Ibff69819e74ac7560df453cbe43a721f82600603
2011-08-01 19:24:35 -07:00
Brett Chabot
b0fd2cf942
Fix runtest --path for package-private frameworks tests.
...
A recent change to runtest resulted in absolute paths incorrectly
being used for a tests build path. This broke the special logic
for frameworks/base tests, since it assumed relative build paths.
Change build paths back to relative paths.
Bug 5105885
Change-Id: I83a26be25294d501cca73eb1b88a7364131b2caf
2011-08-01 16:30:37 -07:00
Isaac Levy
bb0459c45c
Removed Launcher2_intermediates from .classpath
...
Change-Id: I14b8ef9d58becd3d8305014a91d0fab7722f8219
2011-08-01 14:41:08 -07:00
Hugo Hudson
c77b8ff6ac
Merge "Add the variable speed tests to the test runner."
2011-07-29 15:11:18 -07:00
Dianne Hackborn
65b7786636
New API showing the various new service binding flags.
...
Change-Id: I2c19388c1c8b8386d77183c1e1f3aa9eef85cd46
2011-07-29 01:49:10 -07:00
Svetoslav Ganov
7dd37fbbed
Adding a missing documentation of the ActionProvider ActionBar sample.
...
Change-Id: I09772305953f7684388603f3f34ec21c64a09067
2011-07-28 17:50:04 -07:00
Bill Napier
b0f505f07f
Merge "Added deferreturn command"
2011-07-27 11:12:50 -07:00
Liran
772468f2b6
GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS
...
nvidia may return GL_VALIDATE_STATUS = GL_TRUE even when the program does not link
this change checks for GL_LINK_STATUS when GL_VALIDATE_STATUS is queried
Change-Id: Ia9f5da9c71b8666ce929d8cc2a44639bc947eecb
2011-07-27 15:19:11 +03:00
Liran
715c4898df
2.0 translator: workaround for nVidia "bug"
...
This is not really a bug, but the nVidia shader compiler is much more
liberal than the GLSL spec, and allows compilation of shaders which
do not comply with the spec. This is an issue for passing the
conformance tests, but more importantly it will allow bad shader written
by the app developer to pass on the emulator and then to fail on the device.
Adding "#version 100" definition to the head of a shader source disables
this liberal behavior. For now this is activated in run time by the "NV_WAR"
environment variable.
Change-Id: I1c322d4221d313d3ee70592bc15ea0e340853990
2011-07-27 15:19:11 +03:00
Liran
dd954c869c
GLES2 translator: host does not support RGB565
...
When calling RenderbufferStorage with internalformat=GL_RGB565
we will create one with internal format GL_RGB
the same for glTexImage2D
Change-Id: I1e464dd36142f586beef6bf895456c7aab1b8237
2011-07-27 15:19:11 +03:00
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