David Turner
4b3baea530
am 6b2470ef: am 450fb0a6: Merge "opengles emulator: cache all buffer on the guest"
...
* commit '6b2470ef2b1e9915ad6303607aefd8659ebc502c':
opengles emulator: cache all buffer on the guest
2011-08-09 10:05:58 -07:00
David Turner
19fdd87fc6
am 8cfde07c: am a0045f20: Merge "opengles emulator: dynamicaly grow ReadBuffer"
...
* commit '8cfde07c61e9ab0b8b9d8815547124545f59f80d':
opengles emulator: dynamicaly grow ReadBuffer
2011-08-09 10:05:52 -07:00
David Turner
8713e3858c
am ecb7c06f: am 321714ab: Merge "opengles emulator: fix eglGetError"
...
* commit 'ecb7c06ff4a670ea473ac053aaa9c0f99f4e0bf6':
opengles emulator: fix eglGetError
2011-08-09 10:05:46 -07:00
David Turner
1a30107ecc
am 81e21789: am c1db962f: Merge "opengles emulator: inc/dec ref-count of buffer on SwapBuffers"
...
* commit '81e21789a87f530cec499694186885cbe059b7db':
opengles emulator: inc/dec ref-count of buffer on SwapBuffers
2011-08-09 10:05:39 -07:00
David Turner
611b3af642
am 385d396f: Merge "opengles emulator: fixing GL_HALF_FLOAT_OES bug"
...
* commit '385d396f1e797c7caef66b59e8aafe2d3050293f':
opengles emulator: fixing GL_HALF_FLOAT_OES bug
2011-08-09 08:57:56 -07:00
David Turner
89c5482b0f
am 283df9c4: Merge "opengles emulator: forced GLSL version to be 120."
...
* commit '283df9c42cebba5e2c252faf39754384ab0974a6':
opengles emulator: forced GLSL version to be 120.
2011-08-09 08:56:27 -07:00
David Turner
81973086cf
am c7fb2970: Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"
...
* commit 'c7fb2970ef5a17cbba2bb406a574b078061d0d50':
opengles emulator: GLES2 codec - glFinishRoundTrip
2011-08-09 08:56:25 -07:00
David Turner
e69542091e
am fc15a710: Merge "opengles emulator: test: added shader flags to triangleV2 test"
...
* commit 'fc15a7103db7b62aea7a8ed5260a8a43102afdda':
opengles emulator: test: added shader flags to triangleV2 test
2011-08-09 08:56:23 -07:00
David Turner
96221311b4
am 8b5652be: Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
...
* commit '8b5652be729352613bb874cef51c2556b2c00170':
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
2011-08-09 08:44:35 -07:00
David Turner
d76a710020
am 0660de71: Merge "emulator opengl: fixed encoding of glGenRendebuffer"
...
* commit '0660de71ee9956ca5b5b90860cec03a5ddd9e5f2':
emulator opengl: fixed encoding of glGenRendebuffer
2011-08-09 08:44:33 -07:00
David Turner
e79b525d8b
am bf13fc81: Merge "opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM"
...
* commit 'bf13fc811bc23b22d9d3ceef3cb12d7ec70bc6fe':
opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM
2011-08-09 08:44:31 -07:00
David Turner
853839b72a
am 3618e8c9: Merge "opengles emulator: add GL_OES_depth_texture extension"
...
* commit '3618e8c98b238f6abc1eeddda97c75a9140c52ae':
opengles emulator: add GL_OES_depth_texture extension
2011-08-09 08:44:29 -07:00
David Turner
124babe3b6
am 8abaa9a0: Merge "opengles emulator: fix GL_EXT_packed_depth_stencil string"
...
* commit '8abaa9a0391079799f6a0458f05ecd073a778af3':
opengles emulator: fix GL_EXT_packed_depth_stencil string
2011-08-09 08:44:26 -07:00
David Turner
2b96b0fc99
am 42dd982a: Merge "opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D"
...
* commit '42dd982af0a312c6fa25676b2cb0ff5911e198e6':
opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D
2011-08-09 08:44:24 -07:00
David Turner
42d5bd124b
am ad3f4df3: Merge "opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"
...
* commit 'ad3f4df38857f2c0a456d10bc6644f717693cfb2':
opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
2011-08-09 08:44:21 -07:00
David Turner
9e0dba41bf
am 06524031: Merge "opengles emulator: Call XInitThreads on Linux."
...
* commit '0652403155dd43f112d1de3de7171877d390be8e':
opengles emulator: Call XInitThreads on Linux.
2011-08-09 08:44:18 -07:00
David Turner
c4e4ba87bb
am 0e0638e5: Merge "opengles emulator: fix glGetShaderSource"
...
* commit '0e0638e5448f0fff5d71dacbb528faeda0702350':
opengles emulator: fix glGetShaderSource
2011-08-09 08:44:13 -07:00
David Turner
30dce17194
am a75d7c69: Merge "opengles emulator: fix GLESv2 shader source packing"
...
* commit 'a75d7c694be060f9f88be30210f341c651549532':
opengles emulator: fix GLESv2 shader source packing
2011-08-09 08:44:10 -07:00
David Turner
385d396f1e
Merge "opengles emulator: fixing GL_HALF_FLOAT_OES bug"
2011-08-09 08:40:38 -07:00
David Turner
283df9c42c
Merge "opengles emulator: forced GLSL version to be 120."
2011-08-09 08:40:25 -07:00
David Turner
c7fb2970ef
Merge "opengles emulator: GLES2 codec - glFinishRoundTrip"
2011-08-09 08:40:13 -07:00
David Turner
fc15a7103d
Merge "opengles emulator: test: added shader flags to triangleV2 test"
2011-08-09 08:39:59 -07:00
David Turner
8b5652be72
Merge "opengles emulator: support glEGLImageTargetRenderbufferStorageOES"
2011-08-09 08:39:41 -07:00
Amit Feller
e993528d8e
opengles emulator: fixing GL_HALF_FLOAT_OES bug
...
when calculating the data size to pack, the type GL_HALF_FLOAT_OES,
wasn't recognized at all and therefore was by default 0, while it
should be 2 bytes.
Change-Id: Ib1f0dcdb837dd1b9cfebd1090cabfb59de472c53
2011-08-09 17:38:48 +02:00
Guy Zadickario
ee2388cb94
opengles emulator: forced GLSL version to be 120.
...
GLSL ES 1.0.17 spec states that its written against
OpenGL GLSL version 1.2, that means that #version 100
in GLSL ES should be mapped to #version 120 in OpenGL
GLSL.
We now force "$version 120" in all shaders except if
higher version has been requested in the shader source
or when GOOGLE_GLES_FORCE_GLSL_VERSION is defines.
(Note that GOOGLE_GLES_DEFAULT_GLSL_VERSION is renamed
to GOOGLE_GLES_FORCE_GLSL_VERSION).
That fixes "Aqua Slash GL Demo" application !!
Change-Id: I0f61ba3aa1c5591df3dacd3afd7f216dba13b56e
2011-08-09 17:38:48 +02:00
Liran
e1a6d10a54
opengles emulator: GLES2 codec - glFinishRoundTrip
...
fix glFinishRoundTrip
the function was not implemented on the host side,
calling glFinish caused segfault
Change-Id: Ic3a726d22a499f6560d905d177dcb7f997397628
2011-08-09 17:38:48 +02:00
Guy Zadickario
0d5ea9bb69
opengles emulator: test: added shader flags to triangleV2 test
...
Added the ability to provide external vertex and fragment shader
files to the test application triangleV2. That makes easy to test
various shaders we see failing in applications.
Change-Id: Ifaae8490ac76c022aa712ae516355658922b47bd
2011-08-09 17:38:48 +02:00
Guy Zadickario
6d0f92b88d
opengles emulator: support glEGLImageTargetRenderbufferStorageOES
...
That adds support to create a renderbuffer storage from an EGL
image (previously only texture was supported).
For that we have added Renderbuffer and Framebuffer attachment points
state tracking and when a renderbuffer which attached to an EGLImage
get attached to a framebuffer we attach the underlying EGLImage's
texture instead.
Also fixed some egl_image related bugs.
That makes the egl_image conformance test to pass on host.
Change-Id: I4e8c4935e45b27214038ecf1c1187ed96c5cea5b
2011-08-09 17:38:48 +02:00
David Turner
0660de71ee
Merge "emulator opengl: fixed encoding of glGenRendebuffer"
2011-08-09 08:37:38 -07:00
David Turner
bf13fc811b
Merge "opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM"
2011-08-09 08:37:25 -07:00
Stas Gurtovoy
0710435277
emulator opengl: fixed encoding of glGenRendebuffer
...
Fixed pointer direction to be out (receives info from host).
Change-Id: I881b68393232cd262dd06eb1c124cf305ba28f31
2011-08-09 17:36:35 +02:00
Stas Gurtovoy
9254c7adc1
opengles emulator: fix bugs in CUBE_MAP implementation in GLES_CM
...
We save the texData->target in original format, but use our internal format
(using GLTextureTargetToLocal) to make sure we're not mixing 2D and CUBE_MAP textures on
glBindTexture.
Also added the GL_S/R/T/Q constants where needed.
This fixes the Cube Map test in Api Demos.
Change-Id: Id5de45581f2227fe0978d7982a147cb6b4b595c4
2011-08-09 17:36:35 +02:00
David Turner
ad3166add7
am 9e883e8b: Merge "opengles emulator: fix eglGetProcAddress"
...
* commit '9e883e8b5fa510593ba43cbf3f77db39c34db015':
opengles emulator: fix eglGetProcAddress
2011-08-09 08:36:08 -07:00
David Turner
53dfd83d48
am 23685f03: Merge "opengles emulator: fixed EGLContext and EGLSurface ref-counting."
...
* commit '23685f03992b3aca25fd087a468cf95fdb2b9282':
opengles emulator: fixed EGLContext and EGLSurface ref-counting.
2011-08-09 08:35:56 -07:00
David Turner
2ad48e99d2
am 54502698: Merge "opengles emulator: fix the mixing between pack/unpack alignments"
...
* commit '54502698db433121bd200481aa6b8bba6de85310':
opengles emulator: fix the mixing between pack/unpack alignments
2011-08-09 08:35:54 -07:00
David Turner
6b2470ef2b
am 450fb0a6: Merge "opengles emulator: cache all buffer on the guest"
...
* commit '450fb0a600eba5e80ac703fd3ac7c71955ffcc15':
opengles emulator: cache all buffer on the guest
2011-08-09 08:35:51 -07:00
David Turner
8cfde07c61
am a0045f20: Merge "opengles emulator: dynamicaly grow ReadBuffer"
...
* commit 'a0045f207807928ff6fa0a66d9e0ecf4de635782':
opengles emulator: dynamicaly grow ReadBuffer
2011-08-09 08:35:40 -07:00
David Turner
ecb7c06ff4
am 321714ab: Merge "opengles emulator: fix eglGetError"
...
* commit '321714abd24dfcd5e222b2b7c21780f558d9e5c9':
opengles emulator: fix eglGetError
2011-08-09 08:35:37 -07:00
David Turner
81e21789a8
am c1db962f: Merge "opengles emulator: inc/dec ref-count of buffer on SwapBuffers"
...
* commit 'c1db962fb79640ebcfb15b4ef3002a0193e634c1':
opengles emulator: inc/dec ref-count of buffer on SwapBuffers
2011-08-09 08:35:35 -07:00
David Turner
3618e8c98b
Merge "opengles emulator: add GL_OES_depth_texture extension"
2011-08-09 08:34:55 -07:00
David Turner
8abaa9a039
Merge "opengles emulator: fix GL_EXT_packed_depth_stencil string"
2011-08-09 08:34:40 -07:00
David Turner
42dd982af0
Merge "opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D"
2011-08-09 08:34:31 -07:00
David Turner
ad3f4df388
Merge "opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS"
2011-08-09 08:34:21 -07:00
Yochai Shefi Simchon
65f8c50cbb
opengles emulator: add GL_OES_depth_texture extension
...
Change-Id: I4f254be743b61ba00ebf58d136aa91f4eaf8b643
2011-08-09 17:33:04 +02:00
Yochai Shefi Simchon
c8dfd865fc
opengles emulator: fix GL_EXT_packed_depth_stencil string
...
It used to be a GL_NV_packed_depth_stencil string extension, but
now it's GL_EXT_packed_depth_stencil and implemented by everyone. on
nVidia drivers both are exported.
Change-Id: I1b4af8a776f9957838d466b24fe73fa873ea85e4
2011-08-09 17:33:04 +02:00
Yochai Shefi Simchon
70d6f3e2b9
opengles emulator: 2.0: handle texture=0 on glFramebufferTexture2D
...
texture=0 has a special meaning - detach texture. Therefore we should pass
it on as 0 rather than look for the global name in the name space.
Change-Id: If7d0174a7fd07fc13a75430312b605497653f01b
2011-08-09 17:33:04 +02:00
Yochai Shefi Simchon
a182a1a7e4
opengles emulator: limit GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
...
A bug in the ATI OpenGL driver causes glGet(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS)
to return 32, although the driver supports only 16. The minimum required
by the spec is 2, so limit the number to 16.
Change-Id: Ife99dc5544f80ad872362414e9a5d9d2722d8a42
2011-08-09 17:33:03 +02:00
David Turner
0652403155
Merge "opengles emulator: Call XInitThreads on Linux."
2011-08-09 08:30:47 -07:00
David Turner
0e0638e544
Merge "opengles emulator: fix glGetShaderSource"
2011-08-09 08:30:37 -07:00
David Turner
a75d7c694b
Merge "opengles emulator: fix GLESv2 shader source packing"
2011-08-09 08:30:22 -07:00