Mesa (main): mapi: generate correct dispatch for EXT_draw_instanced

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: ad2902cbbe0c87def5656e081cd9006fc4d74cc9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad2902cbbe0c87def5656e081cd9006fc4d74cc9

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Dec 30 04:57:07 2021 +1000

mapi: generate correct dispatch for EXT_draw_instanced

These APIs can be exposed in GLES2.0 via EXT_draw_instanced,
they were incorrectly being stuck on GLES 3.0 only.

Fixes piglit ext_draw_instanced-drawarrays

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14338>

---

 src/gallium/drivers/crocus/ci/crocus-g41-fails.txt | 2 --
 src/mapi/glapi/gen/GL3x.xml                        | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt b/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt
index 0a21a08f42b..c38bcb15916 100644
--- a/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt
+++ b/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt
@@ -192,8 +192,6 @@ spec at egl_khr_surfaceless_context@viewport,Fail
 # Regression from i965
 spec at ext_draw_buffers2@fbo-drawbuffers2-blend,Fail
 
-spec at ext_draw_instanced@ext_draw_instanced-drawarrays,Fail
-
 # "Failed blit src(0,0;1,1) - dst(0,0;2147483647,2147483647)
 #  Failed blit src(0,0;40,40) - dst(0,0;134217727,134217727)
 #  Failed blit src(0,0;40,40) - dst(0,0;2147483647,2147483647)
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index fc15cb02fb6..75307d78c0a 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -542,14 +542,14 @@
   <enum name="PRIMITIVE_RESTART"              value="0x8F9D"/>
   <enum name="PRIMITIVE_RESTART_INDEX"        value="0x8F9E"/>
 
-  <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB" es2="3.0">
+  <function name="DrawArraysInstanced" alias="DrawArraysInstancedARB" es2="2.0">
     <param name="mode" type="GLenum"/>
     <param name="first" type="GLint"/>
     <param name="count" type="GLsizei"/>
     <param name="primcount" type="GLsizei"/>
   </function>
 
-  <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB" es2="3.0">
+  <function name="DrawElementsInstanced" alias="DrawElementsInstancedARB" es2="2.0">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
     <param name="type" type="GLenum"/>