David Turner
416c517f80
am 0e4f5620: am f61e7a3c: am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
...
* commit '0e4f5620922694b1ec2a05371c4365ab43af0767':
opengl translator: moved some types out of eglplatform.h
2011-06-09 11:17:39 -07:00
David Turner
5ebbc3a011
am 8d6b45e8: am ee00d4b4: am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
...
* commit '8d6b45e860d642979198445d09bb8f8103026546':
opengl translator: initialize dispatch with dummy functions
2011-06-09 11:17:14 -07:00
David Turner
0b743e78a5
am b6b866c5: am 638e7d8b: am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
...
* commit 'b6b866c5a9f6cca5492b20b9ecbb6ba8b1b1abcf':
implementing mac OS support for translator's libs
2011-06-08 14:49:06 -07:00
David Turner
c0858766c4
am 1a77f754: am 2e8d5e1d: am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
...
* commit '1a77f754d1c11113fe863ee6ea8b09d639c8c6b3':
opengl translator: GLSL ES translation
2011-06-08 14:49:02 -07:00
David Turner
593737d5c3
am a3d243e0: am 9178b80c: am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
...
* commit 'a3d243e00f283e2671d834f5584eae5562b09706':
opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-08 14:48:59 -07:00
David Turner
3466ceddc5
am 3d03d485: am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
...
* commit '3d03d4854b9c820b95ca58e6b39477ae314812b1':
fixes for gles2 tests
2011-06-08 14:48:50 -07:00
David Turner
0a5263397a
am 8c5259cd: am 3ba3156e: am a68506a3: am bcec626f: Merge "add gles2 extensions"
...
* commit '8c5259cd486321a0c3a23a34a232c38b7a19c8dc':
add gles2 extensions
2011-06-08 14:48:47 -07:00
David Turner
124643d59a
am f19483e5: am 1251787f: am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
...
* commit 'f19483e5351e9d34de24985f552685bd6791f05e':
implement GL_OES_draw_texture
2011-06-08 14:48:43 -07:00
David Turner
e31f32985f
am d07b6c87: am e1beb756: am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
...
* commit 'd07b6c87fe38930a6b02f90da4c06fc30c0dabd5':
Add gles 1 extension implementation to translator
2011-06-08 14:48:38 -07:00
David Turner
b693bff96e
am c89cd7af: am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
...
* commit 'c89cd7afa4909a4df20d0e39234ae1a6afb2012d':
removed old/obsolete file GLEScontext.cpp
2011-06-08 14:48:34 -07:00
David Turner
f674de8877
am ea4284a7: am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
...
* commit 'ea4284a78a1fd4ce5dec93a3ef78672d9a7d9d39':
Fix issues raised by the GLES 1.1 conformance test
2011-06-08 14:48:30 -07:00
David Turner
cd25a18fec
am 0677b7a1: am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
...
* commit '0677b7a1e3e59da389cb78f372818ea8105b092e':
Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-08 14:48:25 -07:00
David Turner
2d6f324464
am 0c5fb2ee: am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
...
* commit '0c5fb2eea730548d0f0e64b8383f7d43e0c02bf0':
Fix a mess in contexts/surfaces reference count
2011-06-08 14:48:10 -07:00
David Turner
184bfc4347
am 01dca04f: am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
...
* commit '01dca04f26c9ef07f39501a1ea69910abc2dc932':
ThreadInfo- use explicit rather than void pointers
2011-06-08 14:47:49 -07:00
David Turner
f4db81ba3d
am 1a34e175: am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
...
* commit '1a34e175fcad09fd38eac6f63f5d526728a610f8':
Fix version returned by eglInitialize from 4.1 to 1.4.
2011-06-08 14:47:38 -07:00
David Turner
3b2f4ee1a8
am f90611b8: am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit 'f90611b8400d03c0d2ed5a29ab741cbcab18fad6':
EglChooseConfig should handle the case where "configs" is NULL.
2011-06-08 14:47:32 -07:00
David Turner
dc4a727fb9
am cb802ae3: am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_C
...
* commit 'cb802ae3d9ece422dca25e98e153a65b172e3192':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-08 14:47:22 -07:00
David Turner
58c9ec5af9
am 1ccce78e: am e490d50e: am 8c7d5519: Merge "opengl translator: make GLcommon static library"
...
* commit '1ccce78ed693b7e796289e388bab2d6e200bcbdb':
opengl translator: make GLcommon static library
2011-06-07 15:13:35 -07:00
David Turner
0e4f562092
am f61e7a3c: am 94f566f8: am cc3b3887: Merge "opengl translator: moved some types out of eglplatform.h"
...
* commit 'f61e7a3c985e8883efa6de35d9fec877be9f51fe':
opengl translator: moved some types out of eglplatform.h
2011-06-07 15:13:33 -07:00
David Turner
8d6b45e860
am ee00d4b4: am 7870c9f5: am 8a96cb7e: Merge "opengl translator: initialize dispatch with dummy functions"
...
* commit 'ee00d4b4138a2f3c2b4049289564724194fb9450':
opengl translator: initialize dispatch with dummy functions
2011-06-07 15:13:30 -07:00
David Turner
b6b866c5a9
am 638e7d8b: am 5f82c3ab: am a1b9f9bc: Merge "implementing mac OS support for translator\'s libs"
...
* commit '638e7d8bd223772317b9939cbf84516cdd88a5f5':
implementing mac OS support for translator's libs
2011-06-07 13:25:16 -07:00
David Turner
1a77f754d1
am 2e8d5e1d: am 4de570c9: am f3c023e4: Merge "opengl translator: GLSL ES translation"
...
* commit '2e8d5e1dabd51a147317c01ad894591465fe45a0':
opengl translator: GLSL ES translation
2011-06-07 13:25:07 -07:00
David Turner
a3d243e00f
am 9178b80c: am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
...
* commit '9178b80ce4951119f8ecac7a595e0d2a1b4abdb9':
opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-07 13:24:59 -07:00
David Turner
3d03d4854b
am e3ca49a9: am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
...
* commit 'e3ca49a9495e5cd36b5cd3bcd163e11758a4e4cf':
fixes for gles2 tests
2011-06-07 13:24:54 -07:00
David Turner
8c5259cd48
am 3ba3156e: am a68506a3: am bcec626f: Merge "add gles2 extensions"
...
* commit '3ba3156e134953a88648ab8a732b291651eaafa4':
add gles2 extensions
2011-06-07 13:24:51 -07:00
David Turner
f19483e535
am 1251787f: am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
...
* commit '1251787f846dd73ff1cc739064947586a98f301f':
implement GL_OES_draw_texture
2011-06-07 13:24:47 -07:00
David Turner
d07b6c87fe
am e1beb756: am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
...
* commit 'e1beb756312c647b938b875f28177ec87c5c99f2':
Add gles 1 extension implementation to translator
2011-06-07 13:24:42 -07:00
David Turner
c89cd7afa4
am 0777f78e: am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
...
* commit '0777f78ee81b4089f88290af82db2055906a73ab':
removed old/obsolete file GLEScontext.cpp
2011-06-07 13:24:38 -07:00
David Turner
ea4284a78a
am f3c78295: am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
...
* commit 'f3c78295e6d7415b9899778f07ff7ba32ede136e':
Fix issues raised by the GLES 1.1 conformance test
2011-06-07 13:24:34 -07:00
David Turner
0677b7a1e3
am f68103bf: am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
...
* commit 'f68103bf0df892b35c66615efd4c504ef7e96918':
Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-07 13:24:29 -07:00
David Turner
0c5fb2eea7
am b848ebfe: am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
...
* commit 'b848ebfedca6087a327ffab2c402828398241b0a':
Fix a mess in contexts/surfaces reference count
2011-06-07 13:24:24 -07:00
David Turner
01dca04f26
am 5eac0624: am 8821d5a5: Merge "ThreadInfo- use explicit rather than void pointers"
...
* commit '5eac0624d2307ee537d0b4ee6587a02738118c29':
ThreadInfo- use explicit rather than void pointers
2011-06-07 13:22:24 -07:00
David Turner
1a34e175fc
am 3f232d30: am 0b05185e: Merge "Fix version returned by eglInitialize from 4.1 to 1.4."
...
* commit '3f232d30586cddb9b463c7557095906fd58a2db7':
Fix version returned by eglInitialize from 4.1 to 1.4.
2011-06-07 13:22:18 -07:00
David Turner
f90611b840
am 9448b1c2: am 8c141dd2: Merge "EglChooseConfig should handle the case where "configs" is NULL."
...
* commit '9448b1c2822eaf7a55ceaa3feefa88941d8b47d9':
EglChooseConfig should handle the case where "configs" is NULL.
2011-06-07 13:22:13 -07:00
David Turner
cb802ae3d9
am 6d70e8c3: am bf483268: Merge "Emulators\'s GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into
...
* commit '6d70e8c39ec00488ce8acb94d39a77072d9ef465':
Emulators's GLES 2.0 translator implementation This is the GLESv2 on top of openGL implementation on the host most of this change is moving code which is necessary by both GLES 1.0 and GLES 2.0 implementations from GLES_CM folder into GLcommon folder.
2011-06-07 13:21:44 -07:00
Guy Zadikario
cd1489a89c
opengl translator: make GLcommon static library
...
This change turns GLcommon to be static instead of shared
library.
Removed the s_globalNameSpace static object from objectNameManager
and moved it to live inside the EglDisplay object which is shared
for all display space objects (GLESv1, GLESv2 and EGL).
Change-Id: I92fa71fb7cbac423c22b7188e8d9642a5fddf0d9
2011-06-07 11:29:15 +02:00
Amit Feller
0db9dae215
opengl translator: moved some types out of eglplatform.h
...
Some native types like NativeFBConfig and NativeContext are
internal to the translator implementation and should not
exist in the interface headers.
Moved those types from eglplatform.h into eglinternalplatfom.h
Change-Id: I6462a007de8c185deecbb9beebc343ca3626fd0c
2011-06-06 19:01:45 +03:00
Amit Feller
c879e1c8a6
opengl translator: initialize dispatch with dummy functions
...
Initialize the GLDispatch with dummy function instead of
NULL pointer in case the function does not present on the
host OpenGL library. Prevent ugly segfault when a call to
such function is made.
Change-Id: I3488e60e091af06273a5680accabb7fe30fab066
2011-06-06 19:01:45 +03:00
Amit Feller
3dd22a5450
implementing mac OS support for translator's libs
...
Change-Id: Ifa12cf1177db49197ad8496f4e0ef8098d43aa8d
2011-06-06 18:45:01 +03:00
Amit Feller
dd26774dac
opengl translator: GLSL ES translation
...
There are some differences between GLSL/ES and Desktop
GLSL. This change translate the GLSL/ES shader source
to be compatible with the desktop GLSL language.
Change-Id: Ia6fdd6a90944926adcf440299b9ea3a4500d1eb1
2011-06-06 18:45:01 +03:00
Amit Feller
d61fb75ef8
opengl translator: added EGL_RENDERABLE_TYPE attrib
...
fixing bug in eglChooseConfig, there was no referer to
EGL_RENDERABLE_TYPE this caused the eglChooseConfig to fail
when an attribute EGL_RENDERABLE_TYPE was specified in
the attrib_list
Change-Id: Ib4635a55ef3cc0ff380e581d4a41602ddfd32f82
2011-06-06 18:45:01 +03:00
Liran
e4b6d4a629
fixes for gles2 tests
...
load necessary functions from gl dispatch for gles2
fix usage of global names in some functions
combine the shaders and programs namespace to one
Change-Id: I92bd90a91a5840fcceebd05ab06bebb65bb415a0
2011-06-06 13:22:38 +03:00
Liran
da84d440c6
add gles2 extensions
...
implement extensions for gles2
add missing entry point for gles1 EGLImage extension
Change-Id: I7cf0118fdf69f3fb2a7023cf97134efd6aabbf59
2011-06-06 13:22:38 +03:00
Liran
d94a2efe6a
implement GL_OES_draw_texture
...
Change-Id: I9f91fa63dab0cf769dd5ee609c96d1143122991c
2011-06-06 13:22:38 +03:00
Liran
3b7e5e3281
Add gles 1 extension implementation to translator
...
This fix addes to the Translator the implementations of theses extensions:
GL_EXT_texture_format_BGRA8888
GL_OES_blend_equation_separate
GL_OES_blend_func_separate
GL_OES_blend_subtract
GL_OES_depth24
GL_OES_matrix_palette
GL_OES_extended_matrix_palette
GL_OES_element_index_uint
GL_OES_framebuffer_object
GL_OES_packed_depth_stencil
GL_OES_point_size_array
GL_OES_point_sprite
GL_OES_read_format
GL_OES_stencil_wrap
GL_OES_texture_env_crossbar
GL_OES_texture_cube_map
GL_OES_texture_mirrored_repeat
Change-Id: I472808d123ec0e03279137a48d89dc4b19023758
2011-06-06 13:22:30 +03:00
Guy Zadikario
a7f83c0565
removed old/obsolete file GLEScontext.cpp
...
Change-Id: I82f21eef958e37515b46279cf2b44386320723ca
2011-06-06 13:19:26 +03:00
Yochai Shefi Simchon
3150361b51
Fix issues raised by the GLES 1.1 conformance test
...
- Most of the fixes are about unhandled enums.
- Adding an unbindBuffer method to GLEScontext, and use it in the
glDeleteBuffers call, so a buffer is not considered bound after
it has been deleted.
- Handle the case where a call to glCompressedTexImage2D gets
NULL as its data (in which case the uncompressTexture function
should only calculate the output format, but not attempt to
uncompress the NULL data).
- A few segfaults.
Change-Id: I6a856ea6da1be3b15b41140d6383508a6803897c
2011-06-05 13:34:27 +03:00
Yochai Shefi Simchon
889d928f29
Fix a bug where eglMakeCurrent(NULL) did not work
...
This happened because the VALIDATE macros terminated the function prematurally.
Also clear the surface bindings from the previous context.
Change-Id: I33d587f5e877caa6ec651a04ff887e0c77a9d5f3
2011-05-31 15:01:59 +03:00
Yochai Shefi Simchon
88ec3acc83
Fix a mess in contexts/surfaces reference count
...
The main issue was that SmartPtr had an implicit cast to void*, returning its
internal pointer. This allowed writing unsafe code, since the internal pointer
could be handled without increasing its ref count.
So, removed this cast and fixed the various places which relied on it.
Also, fix two calls to "destroy" ahich should have been "markForDestruction".
The naming is not good, should probably change it in a later patch.
Change-Id: Idabc800e97649b2e2404fb7387d25deac70af62e
2011-05-31 15:01:59 +03:00
Yochai Shefi Simchon
eada5b81de
ThreadInfo- use explicit rather than void pointers
...
Replace the void* pointers with explicit pointers for EglContext, EglDisplay
and GLEScontext. Use forward declarations. This is to improve finding errors
in compile time rather than on run time.
Change-Id: Iaec3c36c1e12f36b37d34f68e9d8aa58ff1b30c0
2011-05-31 14:59:20 +03:00