After I was able to remove the ARB_geometry_shader4 extension I have now rebased my OES_geometry_shader patches.
In order to avoid confusion I send V2 for all patches, i.e. all of my old OES_geometry_shader patches are now obsolete. The patches are available here: https://github.com/MartaLo/mesa/tree/gl_oes_geometry_shader_v2 Changes for V2: gles2: Update gl2ext.h to revision: 32902: Updated to the latest gl2ext.h glapi: add GL_OES_geometry_shader extension: After comments from Ilia I squashed my previous, http://patchwork.freedesktop.org/patch/60228/ and http://patchwork.freedesktop.org/patch/60225/ patches. glsl: add support for GL_OES_geometry_shader: After comments from Ilia, added support for glsl version 3.2 mesa: enable enums for OES_geometry_shader: This needed some work after the ARB_geometry_shader4 was removed. After a comment from Ilia, I moved all OES_geometry_shader enums to GL_CORE and GLES31. I created new EXTRA_EXT for enums that OES_geometry_shader has in common with ARB_shader_storage_buffer_object, ARB_gpu_shader5 and ARB_viewport_array. In my previous patch for the ARB_viewport_array enum LAYER_PROVOKING_VERTEX, I added an extra that checked ARB_viewport_array or OES_geometry_shader. But since ARB_viewport array requires EXT_geometry_shader4, I believe it is better to check if some version of geometry shader is available. The dependency for ARB_viewport_array on geometry shader should be fixed in a another patch. Also, we may need to discuss if the full ARB_viewport_array should be exposed under GLES 3.1. I also renamed the GS4 EXTRA_EXT stuff to only GS. I should have done that when I removed the ARB_geometry_shader4 the rest of the changes are simple rebases. Marta Lofstedt (6): gles2: Update gl2ext.h to revision: 32120 glapi: add GL_OES_geometry_shader extension glsl: add support for GL_OES_geometry_shader mesa: enable enums for OES_geometry_shader mesa: Update _mesa_has_geometry_shaders doc: Set GL_OES_geometry_shader as started docs/GL3.txt | 2 +- include/GLES2/gl2ext.h | 940 +++++++++++++++++++++++++++++++- src/glsl/builtin_variables.cpp | 17 +- src/glsl/glsl_parser.yy | 4 +- src/glsl/glsl_parser_extras.cpp | 1 + src/glsl/glsl_parser_extras.h | 2 + src/mapi/glapi/gen/apiexec.py | 2 +- src/mapi/glapi/gen/es_EXT.xml | 43 ++ src/mesa/main/context.h | 3 +- src/mesa/main/extensions_table.h | 1 + src/mesa/main/get.c | 58 +- src/mesa/main/get_hash_params.py | 50 +- src/mesa/main/mtypes.h | 1 + src/mesa/main/tests/dispatch_sanity.cpp | 3 + 14 files changed, 1076 insertions(+), 51 deletions(-) -- 2.5.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
