Commit Graph

5428 Commits

Author SHA1 Message Date
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
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
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
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
David Turner
ecf6676949 am 682f9143: am e6c1178e: Merge "use Translator\'s glTexImage2D in doCompressedTexImage2D"
* commit '682f914304e270824ebf050993d376ddb06613a4':
  use Translator's glTexImage2D in doCompressedTexImage2D
2011-07-14 16:03:52 -07:00
David Turner
682f914304 am e6c1178e: Merge "use Translator\'s glTexImage2D in doCompressedTexImage2D"
* commit 'e6c1178e020a3ae65412917661ccda718830c18f':
  use Translator's glTexImage2D in doCompressedTexImage2D
2011-07-14 16:02:32 -07:00
David Turner
e6c1178e02 Merge "use Translator's glTexImage2D in doCompressedTexImage2D" 2011-07-14 15:51:32 -07:00
David Turner
d6d5ed989e am b3dbf9b0: am 02acec79: Merge "emulator:opengl: fix windows build"
* commit 'b3dbf9b05db277d5cef44c1fd319c493c4f08eba':
  emulator:opengl: fix windows build
2011-07-14 14:45:28 -07:00
David Turner
b3dbf9b05d am 02acec79: Merge "emulator:opengl: fix windows build"
* commit '02acec7961992a9da7a9e4893c7483cdaae8703a':
  emulator:opengl: fix windows build
2011-07-14 14:43:37 -07:00
David Turner
02acec7961 Merge "emulator:opengl: fix windows build" 2011-07-14 14:30:14 -07:00
David Turner
b75382ea35 emulator:opengl: fix windows build
This fixes the Windows build of the opengl emulation code.

The official is not broken because you still need to define
BUILD_EMULATOR_OPENGL=true in your environment to enable the
code to be built.

Change-Id: I527f305c8a09df2740a93736123935d480170ffb
2011-07-14 23:29:32 +02:00
Stas Gurtovoy
99ef052675 use Translator's glTexImage2D in doCompressedTexImage2D
Instead of calling the dispatcher directly. This will make sure all Translator's
internals (such as TextureData data) are updated properly.
This also fixes the bug in "Replica Island" - when the green robot was invisible,
because it's TextureData wasn't updated by doCompressedTexImage2D

The pointer to glTexImage2D is passed as a parameter to doCompressedTexImage2D,
otherwise Windows resolve the glTexImage2D symbol in the external libGL rather
than the translator's code. Longer term, we will remove the translator's link
to libGL, at which point this parameter will be removed.
2011-07-14 13:42:13 +03: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
David Turner
b26d94c5a0 Merge "opengles Translator: DrawTex impl - don't draw if no textures enabled." 2011-07-13 18:07:41 -07:00
David Turner
98030a4f20 Merge "2.0 translator: support ARB_ES2_compatibility stuff" 2011-07-13 18:07:29 -07:00
David Turner
cea49c2ff2 Merge "translator EGL:fixing bug in eglGetDisplay caused in Windows Platform" 2011-07-13 18:07:18 -07:00
David Turner
a99be30d60 Merge "opengles Translator: get Compressed texture handling out from GLEScontext" 2011-07-13 18:07:08 -07:00