Commit Graph

6884 Commits

Author SHA1 Message Date
David Turner
4de570c974 am f3c023e4: Merge "opengl translator: GLSL ES translation"
* commit 'f3c023e482ac51268c3c30f50c5490afa17773ad':
  opengl translator: GLSL ES translation
2011-06-06 09:03:57 -07:00
David Turner
eae0aff8d4 am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"
* commit '87043c4e67c68cff7566265f4c4acb86482bf174':
  opengl translator: added EGL_RENDERABLE_TYPE attrib
2011-06-06 09:03:55 -07: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
David Turner
a1b9f9bc16 Merge "implementing mac OS support for translator's libs" 2011-06-06 08:56:45 -07:00
David Turner
f3c023e482 Merge "opengl translator: GLSL ES translation" 2011-06-06 08:56:24 -07:00
David Turner
87043c4e67 Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib" 2011-06-06 08:56:13 -07: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
David Turner
e3ca49a949 am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"
* commit '3b987d0cd7225feee6813a4893eeefe4f0974d40':
  fixes for gles2 tests
2011-06-06 07:50:14 -07:00
David Turner
3ba3156e13 am a68506a3: am bcec626f: Merge "add gles2 extensions"
* commit 'a68506a3adf44a924d4ed84abf13f558909a1f9b':
  add gles2 extensions
2011-06-06 07:50:12 -07:00
David Turner
1251787f84 am 5af3c174: am 4bf1d504: Merge "implement GL_OES_draw_texture"
* commit '5af3c174af77e7bd33dc5629bf9016eb315d8bc0':
  implement GL_OES_draw_texture
2011-06-06 07:50:10 -07:00
David Turner
e1beb75631 am f26f4dd7: am ffe663de: Merge "Add gles 1 extension implementation to translator"
* commit 'f26f4dd753465c22b7508d2f96446cb6da759b6b':
  Add gles 1 extension implementation to translator
2011-06-06 07:50:07 -07:00
David Turner
0777f78ee8 am a2e0e64a: am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
* commit 'a2e0e64af3c891733fadf0a85dc7b8293db285ac':
  removed old/obsolete file GLEScontext.cpp
2011-06-06 07:50:05 -07:00
David Turner
f3c78295e6 am e6868d1e: am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
* commit 'e6868d1eebdc2057c19ecac23cdff37d9ca2cdd2':
  Fix issues raised by the GLES 1.1 conformance test
2011-06-06 07:50:00 -07:00
David Turner
3b987d0cd7 am a2c959d5: Merge "fixes for gles2 tests"
* commit 'a2c959d5450faeed87b020f74f2e8ac21eaef9b3':
  fixes for gles2 tests
2011-06-06 07:34:43 -07:00
David Turner
a68506a3ad am bcec626f: Merge "add gles2 extensions"
* commit 'bcec626f5a82b83af78705c1adc7326bd0fca9e5':
  add gles2 extensions
2011-06-06 07:34:41 -07:00
David Turner
5af3c174af am 4bf1d504: Merge "implement GL_OES_draw_texture"
* commit '4bf1d5042683fe2064819f2b09b90e18db6dbe7f':
  implement GL_OES_draw_texture
2011-06-06 07:34:39 -07:00
David Turner
f26f4dd753 am ffe663de: Merge "Add gles 1 extension implementation to translator"
* commit 'ffe663de02e1b7e3cc5ca4a064d80bd6ad7f161c':
  Add gles 1 extension implementation to translator
2011-06-06 07:34:37 -07:00
David Turner
a2e0e64af3 am 61287c50: Merge "removed old/obsolete file GLEScontext.cpp"
* commit '61287c5092b87c384617cb0e06464db247786a48':
  removed old/obsolete file GLEScontext.cpp
2011-06-06 07:34:34 -07:00
David Turner
e6868d1eeb am 299a140c: Merge "Fix issues raised by the GLES 1.1 conformance test"
* commit '299a140c60efbc920a948364d28f5c6eaff4ee4f':
  Fix issues raised by the GLES 1.1 conformance test
2011-06-06 07:34:29 -07:00
David Turner
a2c959d545 Merge "fixes for gles2 tests" 2011-06-06 05:22:28 -07:00
David Turner
bcec626f5a Merge "add gles2 extensions" 2011-06-06 05:21:16 -07:00
David Turner
4bf1d50426 Merge "implement GL_OES_draw_texture" 2011-06-06 05:12:13 -07:00
David Turner
ffe663de02 Merge "Add gles 1 extension implementation to translator" 2011-06-06 05:10:59 -07:00
David Turner
61287c5092 Merge "removed old/obsolete file GLEScontext.cpp" 2011-06-06 04:25:26 -07: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
David Turner
299a140c60 Merge "Fix issues raised by the GLES 1.1 conformance test" 2011-06-06 01:50:56 -07: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
David Turner
f68103bf0d am 1e4d92ca: am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
* commit '1e4d92cadfb443b0128f615b64b74b6730fd2f32':
  Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-03 18:38:21 -07:00
David Turner
b848ebfedc am 62f593fa: am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
* commit '62f593fa2daf2ebc1ba3d10dc4a46dbd2ef3bf39':
  Fix a mess in contexts/surfaces reference count
2011-06-03 18:38:18 -07:00
David Turner
1e4d92cadf am 67032b23: Merge "Fix a bug where eglMakeCurrent(NULL) did not work"
* commit '67032b23966bc0a7231b2d6825ac2f1cf84e9949':
  Fix a bug where eglMakeCurrent(NULL) did not work
2011-06-03 18:19:21 -07:00
David Turner
62f593fa2d am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"
* commit '7660bb5806c285bc5646ad5868b9197012943bcb':
  Fix a mess in contexts/surfaces reference count
2011-06-03 18:19:17 -07:00
Dianne Hackborn
7a16938f3a am b6991d5c: am a6cadd62: am 47f569e4: Lost and found.
* commit 'b6991d5cf17506af0cea039aad4e0ee1ab379449':
  Lost and found.
2011-06-03 17:34:52 -07:00
Andy Stadler
840f368951 am 14eda725: (-s ours) am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
* commit '14eda7256c58e435e9bfad2f0d45e1f6bd715d68':
  DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 16:35:16 -07:00
Dianne Hackborn
f32273ce7d am 6faeacbb: am 068fa0c3: am 72d2e5c1: New demos for the v13 support library.
* commit '6faeacbbc561161a84a26e951f896880baa91ce5':
  New demos for the v13 support library.
2011-06-03 16:21:41 -07:00
David Turner
67032b2396 Merge "Fix a bug where eglMakeCurrent(NULL) did not work" 2011-06-03 15:17:00 -07:00
David Turner
7660bb5806 Merge "Fix a mess in contexts/surfaces reference count" 2011-06-03 14:59:41 -07:00
Dianne Hackborn
b6991d5cf1 am a6cadd62: am 47f569e4: Lost and found.
* commit 'a6cadd6244b4c0045ccb571881af982267b4ee9c':
  Lost and found.
2011-06-03 13:33:06 -07:00
Dianne Hackborn
a6cadd6244 am 47f569e4: Lost and found.
* commit '47f569e460adaef04b75174706b7c95471567ca8':
  Lost and found.
2011-06-03 13:17:32 -07:00
Dianne Hackborn
df92d5c5f6 Fix build.
Change-Id: If9c9289f63f98a8108452020fa28aa16b1d4a78e
2011-06-03 13:09:42 -07:00
Dianne Hackborn
47f569e460 Lost and found.
Change-Id: I3aa4824e2c2157be715d93b698963c54dd98e099
2011-06-03 12:31:09 -07:00
Dianne Hackborn
d190f3b9d0 resolved conflicts for merge of faf6dcd6 to master
Change-Id: I637e2982daefb7c4800ed31bc4cadbfb16cc2c81
2011-06-03 11:05:47 -07:00
Andy Stadler
14eda7256c am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
* commit 'dfb979cd631ef552b627a94a6e88eec6a2db655a':
  DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:33:09 -07:00
Andy Stadler
dfb979cd63 am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2
* commit '7e408e8be4cd546206b45c51fa41cc09939dbe33':
  DO NOT MERGE Replacement sample code for DevicePolicyManager api.
2011-06-03 10:28:42 -07:00