summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-06-22 15:24:04 +0200
committerSamuel Pitoiset <[email protected]>2017-06-23 09:26:43 +0200
commit128822c59f94ce048ca58c389c56d097ae27473b (patch)
tree96c873967fef19c5b201d33f44556823fe3ab94b
parente1d6de7a1e657c9257452b0ebc6344b67b3b27f6 (diff)
mesa: add KHR_no_error support for glViewportArrayv()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/ARB_viewport_array.xml2
-rw-r--r--src/mesa/main/viewport.c9
-rw-r--r--src/mesa/main/viewport.h3
3 files changed, 13 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_viewport_array.xml b/src/mapi/glapi/gen/ARB_viewport_array.xml
index 09bd7d3caf6..da5aed6c177 100644
--- a/src/mapi/glapi/gen/ARB_viewport_array.xml
+++ b/src/mapi/glapi/gen/ARB_viewport_array.xml
@@ -29,7 +29,7 @@
<enum name="PROVOKING_VERTEX" value="0x8E4F"/>
<enum name="UNDEFINED_VERTEX" value="0x8260"/>
- <function name="ViewportArrayv">
+ <function name="ViewportArrayv" no_error="true">
<param name="first" type="GLuint"/>
<param name="count" type="GLsizei"/>
<param name="v" type="const GLfloat *" count="count" count_scale="4"/>
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index 3265f3f59d2..af453fd259e 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -169,6 +169,15 @@ viewport_array(struct gl_context *ctx, GLuint first, GLsizei count,
}
void GLAPIENTRY
+_mesa_ViewportArrayv_no_error(GLuint first, GLsizei count, const GLfloat *v)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ const struct gl_viewport_inputs *const p = (struct gl_viewport_inputs *)v;
+ viewport_array(ctx, first, count, p);
+}
+
+void GLAPIENTRY
_mesa_ViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
{
int i;
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
index 5fc67d2d494..570a23a23b2 100644
--- a/src/mesa/main/viewport.h
+++ b/src/mesa/main/viewport.h
@@ -34,6 +34,9 @@ struct gl_context;
extern void GLAPIENTRY
_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
+void GLAPIENTRY
+_mesa_ViewportArrayv_no_error(GLuint first, GLsizei count, const GLfloat * v);
+
extern void GLAPIENTRY
_mesa_ViewportArrayv(GLuint first, GLsizei count, const GLfloat * v);