summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-22 15:19:34 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-23 09:26:43 +0200
commit0a667f03bbf7c180dbee5a2dd14ed302bad4943a (patch)
tree878863d46f5cd4551305d96df6470871acf5764b /src
parentefd42b5791d0b28b8150ec299b7013e342b87644 (diff)
mesa: add KHR_no_error support for glViewportIndexed*()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/ARB_viewport_array.xml4
-rw-r--r--src/mesa/main/viewport.c15
-rw-r--r--src/mesa/main/viewport.h7
3 files changed, 24 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_viewport_array.xml b/src/mapi/glapi/gen/ARB_viewport_array.xml
index 3e9c65549ef..09bd7d3caf6 100644
--- a/src/mapi/glapi/gen/ARB_viewport_array.xml
+++ b/src/mapi/glapi/gen/ARB_viewport_array.xml
@@ -34,14 +34,14 @@
<param name="count" type="GLsizei"/>
<param name="v" type="const GLfloat *" count="count" count_scale="4"/>
</function>
- <function name="ViewportIndexedf">
+ <function name="ViewportIndexedf" no_error="true">
<param name="index" type="GLuint"/>
<param name="x" type="GLfloat"/>
<param name="y" type="GLfloat"/>
<param name="w" type="GLfloat"/>
<param name="h" type="GLfloat"/>
</function>
- <function name="ViewportIndexedfv">
+ <function name="ViewportIndexedfv" no_error="true">
<param name="index" type="GLuint"/>
<param name="v" type="const GLfloat *" count="4"/>
</function>
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index 49ecdbb7dc1..b94cb56a4b7 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -220,6 +220,14 @@ viewport_indexed_err(struct gl_context *ctx, GLuint index, GLfloat x, GLfloat y,
}
void GLAPIENTRY
+_mesa_ViewportIndexedf_no_error(GLuint index, GLfloat x, GLfloat y,
+ GLfloat w, GLfloat h)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ _mesa_set_viewport(ctx, index, x, y, w, h);
+}
+
+void GLAPIENTRY
_mesa_ViewportIndexedf(GLuint index, GLfloat x, GLfloat y,
GLfloat w, GLfloat h)
{
@@ -228,6 +236,13 @@ _mesa_ViewportIndexedf(GLuint index, GLfloat x, GLfloat y,
}
void GLAPIENTRY
+_mesa_ViewportIndexedfv_no_error(GLuint index, const GLfloat *v)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ _mesa_set_viewport(ctx, index, v[0], v[1], v[2], v[3]);
+}
+
+void GLAPIENTRY
_mesa_ViewportIndexedfv(GLuint index, const GLfloat *v)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
index 88757f0291e..5fc67d2d494 100644
--- a/src/mesa/main/viewport.h
+++ b/src/mesa/main/viewport.h
@@ -37,9 +37,16 @@ _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
extern void GLAPIENTRY
_mesa_ViewportArrayv(GLuint first, GLsizei count, const GLfloat * v);
+void GLAPIENTRY
+_mesa_ViewportIndexedf_no_error(GLuint index, GLfloat x, GLfloat y, GLfloat w,
+ GLfloat h);
+
extern void GLAPIENTRY
_mesa_ViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+void GLAPIENTRY
+_mesa_ViewportIndexedfv_no_error(GLuint index, const GLfloat * v);
+
extern void GLAPIENTRY
_mesa_ViewportIndexedfv(GLuint index, const GLfloat * v);