summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-08-24 12:06:26 +0200
committerSamuel Pitoiset <[email protected]>2017-08-25 11:35:29 +0200
commit1c88ed9558ef38a1334cb63bff16af0c19e69054 (patch)
treee15d6ec3743c48e0b03ebf412831963d275b66e3
parent061a1eebe193094d0f672b0f9b21db6f4ade3cee (diff)
mesa: add KHR_no_error support to glPauseTransformFeedback()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/EXT_transform_feedback.xml2
-rw-r--r--src/mesa/main/transformfeedback.c8
-rw-r--r--src/mesa/main/transformfeedback.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml
index 2f893960c56..b5ba5803886 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -102,7 +102,7 @@
<return type="GLboolean"/>
</function>
- <function name="PauseTransformFeedback" es2="3.0">
+ <function name="PauseTransformFeedback" es2="3.0" no_error="true">
</function>
<function name="ResumeTransformFeedback" es2="3.0">
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 633b629a9d0..c7db48c593b 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -1208,6 +1208,14 @@ pause_transform_feedback(struct gl_context *ctx,
void GLAPIENTRY
+_mesa_PauseTransformFeedback_no_error(void)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ pause_transform_feedback(ctx, ctx->TransformFeedback.CurrentObject);
+}
+
+
+void GLAPIENTRY
_mesa_PauseTransformFeedback(void)
{
struct gl_transform_feedback_object *obj;
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index 148a7767be1..645b71862c2 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -120,6 +120,9 @@ _mesa_BindTransformFeedback(GLenum target, GLuint name);
extern void GLAPIENTRY
_mesa_DeleteTransformFeedbacks(GLsizei n, const GLuint *names);
+void GLAPIENTRY
+_mesa_PauseTransformFeedback_no_error(void);
+
extern void GLAPIENTRY
_mesa_PauseTransformFeedback(void);