LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,510 Commits 2 Branches 0 Tags
3451f2e235a6842a2396daac27b4ab21cb151811
Commit Graph

8510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stas Gurtovoy
1d9dc99abb opengles Translator: get Compressed texture handling out from GLEScontext 
This commit does few things:
1. Gets doCompressedTexImage2D out of the context and TextureUtils
2. Gets palette textures out of TextureUtils and into PaletteTexture
3. Makes TextureUtils generic for all compressed textures
4. Moves the glGet's dealing with compressed textures from GLEScontext to the impl.

Change-Id: Ibbde6968810a66a4f3488f3887ee3f015fc32c11
 2011-07-14 03:05:38 +02:00
David Turner
b2de740a86 am 7fdf635d: Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D" 
* commit '7fdf635d3a583fa419e4a567ffb9741a18784f7c':
  opengles emulator: support for null in data parameter of glCompressedTexImage2D
 2011-07-13 18:05:00 -07:00
David Turner
01427d1286 am c86fa4b8: Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)" 
* commit 'c86fa4b8f34ab06f463d08a447f86f296b38ae12':
  opengles emulator: support NULL as parameter to glTexImage2D (gles1)
 2011-07-13 18:04:57 -07:00
David Turner
7fdf635d3a Merge "opengles emulator: support for null in data parameter of glCompressedTexImage2D" 2011-07-13 18:00:08 -07:00
David Turner
c86fa4b8f3 Merge "opengles emulator: support NULL as parameter to glTexImage2D (gles1)" 2011-07-13 17:59:42 -07:00
Ying Wang
5280e81708 Merge "Remove simulator conditionals." 2011-07-13 16:30:52 -07:00
David Turner
70d01b635a am 5fd128dc: am 85743bc8: am 37ac3401: am 2319e183: Merge "egl emulator: fixes for covegl conformance test" 
* commit '5fd128dcbd645f6f77f55d518569c74c0febaf3f':
  egl emulator: fixes for covegl conformance test
 2011-07-13 14:55:11 -07:00
David Turner
7eb98b846a am 40c3e893: am 37ba60c4: am 4b8bf442: am f4b1fa4c: Merge "GLESv2 Translator: fix glGet*" 
* commit '40c3e89363048b6fe5672e0f32c67210dab47f90':
  GLESv2 Translator: fix glGet*
 2011-07-13 14:55:00 -07:00
David Turner
640a66ee2f am 9e261942: am 735b35fb: am 14fa0201: am c559f761: Merge "GLES2 translator: fix glUseProgram error" 
* commit '9e261942aa9dd9b653a09bb4bc0e66979664ce35':
  GLES2 translator: fix glUseProgram error
 2011-07-13 14:54:41 -07:00
David Turner
b52220aeef am ec430289: am b7b2af83: am 49947927: am ad31d5ca: Merge "GLES2 Translator: GetVertexAttrib* fix" 
* commit 'ec430289b4ea4a5d93a3bffc450744b7b0988bbc':
  GLES2 Translator: GetVertexAttrib* fix
 2011-07-13 14:54:38 -07:00
David Turner
4bbdb6aa3f am 98c54ff0: am d538593a: am 29512bbb: am fbd9283c: Merge "GLES2 translator: fix point rendering" 
* commit '98c54ff09fbd47c30e53a29b6c4b76313c13425d':
  GLES2 translator: fix point rendering
 2011-07-13 14:54:35 -07:00
David Turner
254be80903 am b8d215b0: am 248ba3e5: am a20d6fe0: am e7db3af6: Merge "GLES2 translator: DeleteShader/Program fix" 
* commit 'b8d215b0443a88e4a6b544fbe7a396e7d1519404':
  GLES2 translator: DeleteShader/Program fix
 2011-07-13 14:54:31 -07:00
David Turner
c8a6c1c0c6 am a8d0b7e6: am 87c04589: am 37577cb6: am 05832ade: Merge "opengles Translator: fix uncompress palleted A1 textures" 
* commit 'a8d0b7e6046abe1a61443ffc8420195a03298711':
  opengles Translator: fix uncompress palleted A1 textures
 2011-07-13 14:54:28 -07:00
Xavier Ducrohet
08786e05eb am dd0457ad: am d5394e8f: am d8a9cfce: Fix sample package API level. 
* commit 'dd0457ad254943448a8f3df2082ec2d66e0e6223':
  Fix sample package API level.
 2011-07-13 14:54:00 -07:00
David 'Digit' Turner
1de9a39647 am 6e571c44: am 333a2f81: am dfd5d02c: merge intel x86 patches into gingerbread branch 
* commit '6e571c44188acac4d0e23643ea3372ae827b8b47':
  sdk: Copy ABI-specific kernel image to platform image directory.
 2011-07-13 14:53:50 -07:00
Yu Shan Emily Lau
3de6f45822 Add the pinch and zoom action in the 
scripted monkey.

Change-Id: I658ee5954bc6c994e2206e7bde4aec382a66caea
 2011-07-13 14:35:40 -07:00
Ying Wang
6a42c746e5 Remove simulator conditionals. 
Simulator is gone.

Change-Id: Ia4454bde6d16666830b553ec42e5c19359505103
 2011-07-13 10:34:21 -07:00