Commit Graph

965 Commits

Author SHA1 Message Date
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
Yochai Shefi Simchon
094026698e Fix version returned by eglInitialize from 4.1 to 1.4.
Change-Id: I43f3512374f546a81b7cfbba8959ce9f0ed7fe53
2011-05-31 14:15:02 +03:00
Yochai Shefi Simchon
aac7fe282c EglChooseConfig should handle the case where "configs" is NULL.
Change-Id: I236afdfc73eb5dd5a3ab19e2b388772ea297bdb4
2011-05-31 14:13:26 +03:00
Amit Feller
624176d51a 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.

GLESv2Imp - includes GLES 2.0 entry points implementation

Change-Id: I934fb963478a7f596d824612f847a5aa77d2ed9d
2011-05-30 11:06:24 +03:00
David Turner
e11d8abc25 am d143387d: am 1c53e616: am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"
* commit 'd143387d72e502d5d00ce12163edc40fcfaf9d2d':
  adding functionality to get the local name of an object from it's local name
2011-05-19 03:42:23 -07:00
David Turner
45398e0b8f am a76ded71: am 7e026547: am 83b55247: Merge "this checkin supports windows OS in all Translator libs"
* commit 'a76ded711209190003542c1752c15d1fa445abbf':
  this checkin supports windows OS in all Translator libs
2011-05-19 02:54:09 -07:00
David Turner
d143387d72 am 1c53e616: am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"
* commit '1c53e61689094f088a07b6fb3cb634eda1833f05':
  adding functionality to get the local name of an object from it's local name
2011-05-18 07:42:00 -07:00
David Turner
fd6ed4dd31 Merge "adding functionality to get the local name of an object from it's local name" 2011-05-18 06:52:22 -07:00
David Turner
a76ded7112 am 7e026547: am 83b55247: Merge "this checkin supports windows OS in all Translator libs"
* commit '7e0265477a936ff562dc8cab84a3b24bde267799':
  this checkin supports windows OS in all Translator libs
2011-05-18 03:22:51 -07:00
Amit Feller
f0b7c2e4f9 this checkin supports windows OS in all Translator libs
Note: this is a re-submit of Ie5111d9c435b64d205b140a79863c0273742ee7f,
fixed to avoid breaking the Mac build.

Change-Id: Ib534063d3f403d33d162956bf510baf9689a246a
2011-05-17 21:28:17 +02:00
David 'Digit' Turner
149c180522 am 8fc94823: am 42a6c754: am 3a38c110: Merge "Fix mac build"
* commit '8fc94823cfd7f9f2403f1ad553d84544252c7849':
  Fix mac build
2011-05-17 12:23:50 -07:00
David 'Digit' Turner
8fc94823cf am 42a6c754: am 3a38c110: Merge "Fix mac build"
* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
  Fix mac build
2011-05-17 12:21:29 -07:00
Raphael Moll
7d747db6b1 am 08382e1e: am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
* commit '08382e1e2cae7d0bdf94c493edd24a2644de9b5d':
  Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:14:34 -07:00
Raphael Moll
08382e1e2c am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
* commit 'ed78d63de23730be2a85b7a55b5646b7dc4b7057':
  Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:11:42 -07:00
David 'Digit' Turner
2840185690 Fix mac build
Change-Id: I1fc8c5043160dbe2508324655fb506bc31cc50ac
2011-05-17 21:00:52 +02:00
Raphael Moll
603b37abac Revert "this checkin supports windows OS in all Translator libs"
This reverts commit 0bf6848571.

This commit breaks Mca builds:
  development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp: In function 'EGLBoolean eglChooseConfig(void*, const EGLint*, void**, EGLint, EGLint*)':
  development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp:412: error: 'PIXEL_FORMAT_INITIALIZER' was not declared in this scope
  make: *** [out/host/darwin-x86/obj/SHARED_LIBRARIES/libEGL_translator_intermediates/EglImp.o] Error 1
2011-05-17 11:41:30 -07:00
David Turner
e6ac336c1c am c8e4598a: am 97d1ddc6: am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth""
* commit 'c8e4598a5e29aae5e973ea033b81dd2b64e19492':
  fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
2011-05-17 06:21:54 -07:00
David Turner
c8e4598a5e am 97d1ddc6: am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth""
* commit '97d1ddc632df673693b570bcb8f8fa99b5b9b6da':
  fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
2011-05-17 06:19:57 -07:00
Amit Feller
1f4c692222 adding functionality to get the local name of an object from it's local name
Change-Id: I8c9ccc36a5fb70a38a77fa0f0e7826a6fe886db1
2011-05-17 16:10:27 +03:00
Amit Feller
02c3e538e8 fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
Change-Id: I9700bdb973d2dc01400078c349010a271004dbd9
2011-05-17 15:33:43 +03:00
David Turner
8748cfe6e9 am df0c8dbf: am ce5934c3: am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs"
* commit 'df0c8dbf3d1385205da839011d4645bf1c57f430':
  this checkin supports windows OS in all Translator libs
2011-05-17 04:49:52 -07:00
David Turner
df0c8dbf3d am ce5934c3: am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs"
* commit 'ce5934c3a025d656a7c268e15b766b0b8f20af53':
  this checkin supports windows OS in all Translator libs
2011-05-17 04:45:07 -07:00
Amit Feller
0bf6848571 this checkin supports windows OS in all Translator libs
Change-Id: Ie5111d9c435b64d205b140a79863c0273742ee7f
2011-05-17 11:20:25 +03:00
David Turner
8e80722a9f am d30ae48e: am 41709da8: am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"
* commit 'd30ae48ee4156c05eb310bea2fbcd94e14ebba15':
  small changes to the code before the commit for supporting windows os
2011-05-16 07:41:03 -07:00
David Turner
2d81f95693 am 225830ef: am 7ff51735: am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static"
* commit '225830effb32b24aca07dce61b097c0d8deee940':
  changing GLcommon lib to be a sharedlib instead of static
2011-05-16 07:40:59 -07:00
David Turner
d30ae48ee4 am 41709da8: am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"
* commit '41709da80e95e94d9f533a18b11c646f56cebfba':
  small changes to the code before the commit for supporting windows os
2011-05-16 07:34:01 -07:00
David Turner
225830effb am 7ff51735: am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static"
* commit '7ff51735737bae34b0fe2b7e326a4843fde3b115':
  changing GLcommon lib to be a sharedlib instead of static
2011-05-16 07:33:54 -07:00
David 'Digit' Turner
f3d15e4ff7 am 265327f0: am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements"
* commit '265327f06c60aeed17e600db12ad40367c50ae72':
  emulator: opengl: ut_renderer usability improvements
2011-05-11 13:11:51 -07:00
Amit Feller
6203540306 small changes to the code before the commit for supporting windows os
Change-Id: I062add6d6340677a9e2e98ac47d53c87ad2a6535
2011-05-11 17:48:21 +03:00
Amit Feller
e387c21109 changing GLcommon lib to be a sharedlib instead of static
Change-Id: Ic1fdcd1fbf3105a6fbd26c77e58acbe9b09dcacb
2011-05-11 17:31:02 +03:00