Commit Graph

7252 Commits

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
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
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
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
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
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
Stas Gurtovoy
d9d1006222 opengles emulator: support for null in data parameter of glCompressedTexImage2D
Thought the spec doesn't speak about null in data parameter,
it is checked in covgl - so we'll base it on glTexImage2D and allow
null in data.

Change-Id: I9bf5131852bf795acc7ab89bd17b9df90ac99460
2011-07-13 11:26:37 +03:00
Stas Gurtovoy
c99d4a0594 opengles emulator: support NULL as parameter to glTexImage2D (gles1)
This is implemented using the nullAllowed attrib (same as gles2 in gl2.attrib)

Change-Id: I6d359a112daa8acf36dfa05403df42e921f3502c
2011-07-13 11:26:37 +03:00
Jeff Brown
63a8370e53 Merge "Remove the simulator target from all makefiles. Bug: 5010576" 2011-07-12 14:51:05 -07:00
Andy Stadler
3995c4450c Eclipse IDE classpath fixes
* remove VPN
* add Gallery3D/PicasaProvider
* add frameworks/ex/chips
* add frameworks/opt/calendar

Change-Id: Ia144bc6d739cb3b6c3529caf7062086437295b4e
2011-07-12 10:46:07 -07:00
David Turner
288151c64e am 067426e0: am 0fecb41c: am 7be5b706: Merge "emulator:opengl: input event redirection"
* commit '067426e01beaacf6bfd69bb23dafb789d21d789c':
  emulator:opengl: input event redirection
2011-07-12 03:48:44 -07:00
David Turner
86c57cf449 am dd70f991: am c1c47c08: am 6a9aa82f: Merge "emulator:opengl: custom framebuffer sizes"
* commit 'dd70f991a844e16316fc34c91a4f535ada25e25e':
  emulator:opengl: custom framebuffer sizes
2011-07-12 03:48:41 -07:00
Jeff Brown
04a4d9a0fc Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I3af1c8fb9b1b558a1c03212a2bb1834095c806da
2011-07-11 22:11:50 -07:00
David Turner
067426e01b am 0fecb41c: am 7be5b706: Merge "emulator:opengl: input event redirection"
* commit '0fecb41c1154c5b2ef54677fa32bedf8d0f221ad':
  emulator:opengl: input event redirection
2011-07-11 21:49:31 -07:00