summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2016-04-03 02:44:50 -0400
committerIlia Mirkin <imirkin@alum.mit.edu>2016-04-03 20:40:55 -0400
commitd76e1cd2dd24d0807a8db78fb6f7ebfeb50f22b4 (patch)
treee5ac81906563772871bebf39f9169b44b8dfdfc3
parent807e2c27ac03718df8f53c2f28686dfed4c12677 (diff)
mesa: expose EXT_base_instance in ES3 contexts
This extension is identical to ARB_base_instance. Reuse the same entrypoints. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/mapi/glapi/gen/es_EXT.xml34
-rw-r--r--src/mesa/main/extensions_table.h1
-rw-r--r--src/mesa/main/tests/dispatch_sanity.cpp5
-rw-r--r--src/mesa/vbo/vbo_exec_array.c2
4 files changed, 41 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index 3b2c15ebf5c..bf67eae40d4 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -924,6 +924,40 @@
</category>
+<category name="GL_EXT_base_instance" number="203">
+
+ <function name="DrawArraysInstancedBaseInstanceEXT" es2="3.0"
+ alias="DrawArraysInstancedBaseInstance">
+ <param name="mode" type="GLenum"/>
+ <param name="first" type="GLint"/>
+ <param name="count" type="GLsizei"/>
+ <param name="instancecount" type="GLsizei"/>
+ <param name="baseinstance" type="GLuint"/>
+ </function>
+
+ <function name="DrawElementsInstancedBaseInstanceEXT" es2="3.0"
+ alias="DrawElementsInstancedBaseInstance">
+ <param name="mode" type="GLenum"/>
+ <param name="count" type="GLsizei"/>
+ <param name="type" type="GLenum"/>
+ <param name="indices" type="const GLvoid *"/>
+ <param name="instancecount" type="GLsizei"/>
+ <param name="baseinstance" type="GLuint"/>
+ </function>
+
+ <function name="DrawElementsInstancedBaseVertexBaseInstanceEXT" es2="3.0"
+ alias="DrawElementsInstancedBaseVertexBaseInstance">
+ <param name="mode" type="GLenum"/>
+ <param name="count" type="GLsizei"/>
+ <param name="type" type="GLenum"/>
+ <param name="indices" type="const GLvoid *"/>
+ <param name="instancecount" type="GLsizei"/>
+ <param name="basevertex" type="GLint"/>
+ <param name="baseinstance" type="GLuint"/>
+ </function>
+
+</category>
+
<category name="GL_EXT_draw_elements_base_vertex" number="204">
<function name="DrawElementsBaseVertexEXT" alias="DrawElementsBaseVertex"
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index a31a9a1dc51..ddc25d812c7 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -177,6 +177,7 @@ EXT(ATI_texture_float , ARB_texture_float
EXT(ATI_texture_mirror_once , ATI_texture_mirror_once , GLL, GLC, x , x , 2006)
EXT(EXT_abgr , dummy_true , GLL, GLC, x , x , 1995)
+EXT(EXT_base_instance , ARB_base_instance , x , x , x , 30, 2014)
EXT(EXT_bgra , dummy_true , GLL, x , x , x , 1995)
EXT(EXT_blend_color , EXT_blend_color , GLL, x , x , x , 1995)
EXT(EXT_blend_equation_separate , EXT_blend_equation_separate , GLL, GLC, x , x , 2003)
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index c6599fd5cea..c85bc54fe35 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -2476,6 +2476,11 @@ const struct function gles3_functions_possible[] = {
{ "glDisableiOES", 30, -1 },
{ "glIsEnablediOES", 30, -1 },
+ /* GL_EXT_base_instance */
+ { "glDrawArraysInstancedBaseInstanceEXT", 30, -1 },
+ { "glDrawElementsInstancedBaseInstanceEXT", 30, -1 },
+ { "glDrawElementsInstancedBaseVertexBaseInstanceEXT", 30, -1 },
+
{ NULL, 0, -1 }
};
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index f0245fd08cc..40cf3fff126 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -1739,7 +1739,7 @@ vbo_initialize_exec_dispatch(const struct gl_context *ctx,
}
}
- if (_mesa_is_desktop_gl(ctx)) {
+ if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
SET_DrawArraysInstancedBaseInstance(exec, vbo_exec_DrawArraysInstancedBaseInstance);
SET_DrawElementsInstancedBaseInstance(exec, vbo_exec_DrawElementsInstancedBaseInstance);
SET_DrawElementsInstancedBaseVertexBaseInstance(exec, vbo_exec_DrawElementsInstancedBaseVertexBaseInstance);