LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,277 Commits 2 Branches 0 Tags
39858d19e920cdbb05550ed96e97fe6a9bf49b51
Commit Graph

8277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
David Turner
72e117b602 am b2de740a: am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D" 
* commit 'b2de740a86870a888648a85a11b39bd991eb9405':
  opengles emulator: support for null in data parameter of glCompressedTexImage2D
 2011-07-13 18:06:45 -07:00
David Turner
1d01f3d295 am 01427d12: am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)" 
* commit '01427d12868d5943cb80d430c2bcecd535b2c977':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)
 2011-07-13 18:06:43 -07:00
Yochai Shefi Simchon
31bf4fac95 2.0 Translator:GL_INVALID_VALUE on bad program/shader 
The getGlobalName function returns 0 on error. There are many places
were no error checking is done after calling it to get a shader or
program name. Typically this shouldn't be an issue, since the follwing
OpenGL call using a value of 0 will generated the required GL_INVALID_VALUE,
but this does not always happen.

Change-Id: I8edf2b152978ffd8626f8b4d778cc624f2a3bec3
 2011-07-14 03:05:38 +02:00
Stas Gurtovoy
76007c3b0e Fix parameter parsing in renderer 
Change-Id: I14533cea4a29eff2b3dec3a68e80fc1ae7f44da3
 2011-07-14 03:05:38 +02:00
Stas Gurtovoy
0dad64d939 opengles Translator: DrawTex impl - don't draw if no textures enabled. 
This fixes a crash caused by covgl (on Nvidia linux driver) when our implementation
of glDrawTexOES calls glDrawArrays with GL_TEXTURE_COORD_ARRAY enabled - but none of texture
units are enabled and no data passed by glTexCoordPointer

Change-Id: Id28b0c35a5a17b139ab196db0e434d2f0a490132
 2011-07-14 03:05:38 +02:00
Yochai Shefi Simchon
79b1bad09a 2.0 translator: support ARB_ES2_compatibility stuff 
The ARB_ES2_compatibility extension supports several GLES 2.0 enums
and functions on OpenGL 2.0. Seems it exists on nVidia drivers, but
not on ATI's. So implement its functionality in case it doesn't
exist on the host.

Change-Id: Id96f0c8036a7a7d36fca0c85ab5f57bf4b1583aa
 2011-07-14 03:05:38 +02:00
Amit Feller
1d8465c245 translator EGL:fixing bug in eglGetDisplay caused in Windows Platform 
in Windows platform we previously defined EGLNativeDisplaytype to be WinDisplay*
( this was defined in include/EGL/eglplatform.h) this was OK as long as we used the
the EGL_DEFAULT_DISPLAY as parameter for eglGetDisplay meaning we were generating
a native display by oureselv and wrapping it, but there was aproblem when we got the
EGLNativeDisplayType from the user (as HDC in Windows) but interpret it as WinDisplay*
this caused a big memory corupption.
so to overcome this problem we now define two types EGLNativeDisplayType to be
HDC and EGLNativeInternalDisplayTypeto be WinDisplay*, and when we get in eglGetDisplay
a parameter different from EGL_DEFAULT_DISPLAY we wrap it with the struct of WinDisplay
and return it to the user.

this change caused a change in all the declerations of EglOsApi.h changing
EGLNativeDisplayType -> EGLNativeInternalDisplayType

Change-Id: I3522c3d507b084c5c211e10ddb6f512d1b90c65e
 2011-07-14 03:05:38 +02:00