summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-02-05 14:21:13 -0800
committerJason Ekstrand <[email protected]>2016-02-05 14:21:13 -0800
commit9645b8eb1f1b79e537ad8ddb683507df7bc9da58 (patch)
tree8e554a43a136b5f7951ff8734d42deb5e81c262b /src/mapi
parent3eebf3686be3de10cbeda8acd884e82df3e1438a (diff)
parent41875ac4edd8c884225c44c0840bd20291b410ca (diff)
Merge branch mesa-public/master into vulkan
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/gen/apiexec.py5
-rw-r--r--src/mapi/glapi/gen/es_EXT.xml43
2 files changed, 45 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py
index 58ec08be466..2a8043264eb 100644
--- a/src/mapi/glapi/gen/apiexec.py
+++ b/src/mapi/glapi/gen/apiexec.py
@@ -70,9 +70,8 @@ functions = {
# extension with core profile.
"TexBuffer": exec_info(core=31),
- # OpenGL 3.2 / GL_ARB_geometry_shader4. Mesa does not support
- # GL_ARB_geometry_shader4, so OpenGL 3.2 is required.
- "FramebufferTexture": exec_info(core=32),
+ # OpenGL 3.2 / GL_OES_geometry_shader.
+ "FramebufferTexture": exec_info(core=32, es2=31),
# OpenGL 4.0 / GL_ARB_shader_subroutines. Mesa only exposes this
# extension with core profile.
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index 577d8254c43..86df980304b 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -940,4 +940,47 @@
</function>
</category>
+
+<!-- 175. GL_OES_geometry_shader -->
+<category name="GL_OES_geometry_shader" number="210">
+ <enum name="GEOMETRY_SHADER_OES" value="0x8DD9"/>
+ <enum name="GEOMETRY_SHADER_BIT_OES" value="0x00000004"/>
+ <enum name="GEOMETRY_LINKED_VERTICES_OUT_OES" value="0x8916"/>
+ <enum name="GEOMETRY_LINKED_INPUT_TYPE_OES" value="0x8917"/>
+ <enum name="GEOMETRY_LINKED_OUTPUT_TYPE_OES" value="0x8918"/>
+ <enum name="GEOMETRY_SHADER_INVOCATIONS_OES" value="0x887F"/>
+ <enum name="LAYER_PROVOKING_VERTEX_OES" value="0x825E"/>
+ <enum name="MAX_GEOMETRY_UNIFORM_BLOCKS_OES" value="0x8A2C"/>
+ <enum name="MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_OES" value="0x8A32"/>
+ <enum name="MAX_GEOMETRY_INPUT_COMPONENTS_OES" value="0x9123"/>
+ <enum name="MAX_GEOMETRY_OUTPUT_COMPONENTS_OES" value="0x9124"/>
+ <enum name="MAX_GEOMETRY_OUTPUT_VERTICES_OES" value="0x8DE0"/>
+ <enum name="MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_OES" value="0x8DE1"/>
+ <enum name="MAX_GEOMETRY_SHADER_INVOCATIONS_OES" value="0x8E5A"/>
+ <enum name="MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_OES" value="0x8C29"/>
+ <enum name="MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_OES" value="0x92CF"/>
+ <enum name="MAX_GEOMETRY_ATOMIC_COUNTERS_OES" value="0x92D5"/>
+ <enum name="MAX_GEOMETRY_IMAGE_UNIFORMS_OES" value="0x90CD"/>
+ <enum name="MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_OES" value="0x90D7"/>
+ <enum name="FIRST_VERTEX_CONVENTION_OES" value="0x8E4D"/>
+ <enum name="LAST_VERTEX_CONVENTION_OES" value="0x8E4E"/>
+ <enum name="UNDEFINED_VERTEX_OES" value="0x8260"/>
+ <enum name="PRIMITIVES_GENERATED_OES" value="0x8C87"/>
+ <enum name="LINES_ADJACENCY_OES" value="0xA"/>
+ <enum name="LINE_STRIP_ADJACENCY_OES" value="0xB"/>
+ <enum name="TRIANGLES_ADJACENCY_OES" value="0xC"/>
+ <enum name="TRIANGLE_STRIP_ADJACENCY_OES" value="0xD"/>
+ <enum name="FRAMEBUFFER_DEFAULT_LAYERS_OES" value="0x9312"/>
+ <enum name="MAX_FRAMEBUFFER_LAYERS_OES" value="0x9317"/>
+ <enum name="FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_OES" value="0x8DA8"/>
+ <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED_OES" value="0x8DA7"/>
+ <enum name="REFERENCED_BY_GEOMETRY_SHADER_OES" value="0x9309"/>
+
+ <function name="FramebufferTextureOES" alias="FramebufferTexture" es2="3.1">
+ <param name="target" type="GLenum"/>
+ <param name="attachment" type="GLenum"/>
+ <param name="texture" type="GLuint"/>
+ <param name="level" type="GLint"/>
+ </function>
+ </category>
</OpenGLAPI>