summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-06-22 15:51:46 +0200
committerSamuel Pitoiset <[email protected]>2017-06-23 09:26:43 +0200
commitc244c25ce36f6920c25c8fd8f071038712004f14 (patch)
tree1b37b3a5a86c1c85133537c35ef6a33cf94d8b64 /src
parentad0afa87b8cf8a8783df740d63fe852c2ebba90f (diff)
mesa: add KHR_no_error support for glViewport()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/gl_API.xml2
-rw-r--r--src/mesa/main/viewport.c7
-rw-r--r--src/mesa/main/viewport.h3
3 files changed, 11 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 8784f0537f5..2cc66ac8b0f 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2966,7 +2966,7 @@
<glx rop="190"/>
</function>
- <function name="Viewport" es1="1.0" es2="2.0">
+ <function name="Viewport" es1="1.0" es2="2.0" no_error="true">
<param name="x" type="GLint"/>
<param name="y" type="GLint"/>
<param name="width" type="GLsizei"/>
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index b18168a4d43..8c95bf472d8 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -119,6 +119,13 @@ viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei width,
* parameters.
*/
void GLAPIENTRY
+_mesa_Viewport_no_error(GLint x, GLint y, GLsizei width, GLsizei height)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ viewport(ctx, x, y, width, height);
+}
+
+void GLAPIENTRY
_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
index 570a23a23b2..b07410bf58a 100644
--- a/src/mesa/main/viewport.h
+++ b/src/mesa/main/viewport.h
@@ -31,6 +31,9 @@
struct gl_context;
+void GLAPIENTRY
+_mesa_Viewport_no_error(GLint x, GLint y, GLsizei width, GLsizei height);
+
extern void GLAPIENTRY
_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);