summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-22 12:01:21 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-23 09:26:42 +0200
commit52a448c7d0a22edc896e02d6cf13954c72676b2e (patch)
treebe34405aa9377313835a1d4b91d0868a88659e89
parent5a6779c7222e6c3b8ebe59cac6f098f8f9e82719 (diff)
mesa: add KHR_no_error support for glClipControl()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
-rw-r--r--src/mapi/glapi/gen/ARB_clip_control.xml2
-rw-r--r--src/mesa/main/viewport.c8
-rw-r--r--src/mesa/main/viewport.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_clip_control.xml b/src/mapi/glapi/gen/ARB_clip_control.xml
index ecce133bb9..051a648081 100644
--- a/src/mapi/glapi/gen/ARB_clip_control.xml
+++ b/src/mapi/glapi/gen/ARB_clip_control.xml
@@ -14,7 +14,7 @@
<enum name="CLIP_ORIGIN" value = "0x935C"/>
<enum name="CLIP_DEPTH_MODE" value = "0x935D"/>
- <function name="ClipControl">
+ <function name="ClipControl" no_error="true">
<param name="origin" type="GLenum"/>
<param name="depth" type="GLenum"/>
<!-- <glx rop="1340"/> -->
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index b424d8f654..bb6e8bc50f 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -455,6 +455,14 @@ clip_control(struct gl_context *ctx, GLenum origin, GLenum depth)
void GLAPIENTRY
+_mesa_ClipControl_no_error(GLenum origin, GLenum depth)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ clip_control(ctx, origin, depth);
+}
+
+
+void GLAPIENTRY
_mesa_ClipControl(GLenum origin, GLenum depth)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
index 395131982c..88757f0291 100644
--- a/src/mesa/main/viewport.h
+++ b/src/mesa/main/viewport.h
@@ -74,6 +74,9 @@ extern void
_mesa_init_viewport(struct gl_context *ctx);
+void GLAPIENTRY
+_mesa_ClipControl_no_error(GLenum origin, GLenum depth);
+
extern void GLAPIENTRY
_mesa_ClipControl(GLenum origin, GLenum depth);