summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-08-24 12:10:57 +0200
committerSamuel Pitoiset <[email protected]>2017-08-25 11:35:30 +0200
commit4b5140d20bd0461acf90c92060d8a6180555c78a (patch)
tree9eb76b02e2ba172b9eb245150046bac7c84c653e
parentf0476e00207950cc13e9c845ac4a0203f7e39296 (diff)
mesa: add KHR_no_error support to glResumeTransformFeedback()
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 b5ba5803886..7be87f710a8 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -105,7 +105,7 @@
<function name="PauseTransformFeedback" es2="3.0" no_error="true">
</function>
- <function name="ResumeTransformFeedback" es2="3.0">
+ <function name="ResumeTransformFeedback" es2="3.0" no_error="true">
</function>
<function name="DrawTransformFeedback" exec="dynamic" marshal="draw">
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 02867b5b890..b2cf30cedbd 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -1252,6 +1252,14 @@ resume_transform_feedback(struct gl_context *ctx,
void GLAPIENTRY
+_mesa_ResumeTransformFeedback_no_error(void)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ resume_transform_feedback(ctx, ctx->TransformFeedback.CurrentObject);
+}
+
+
+void GLAPIENTRY
_mesa_ResumeTransformFeedback(void)
{
struct gl_transform_feedback_object *obj;
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index 645b71862c2..930c88a1f2b 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -126,6 +126,9 @@ _mesa_PauseTransformFeedback_no_error(void);
extern void GLAPIENTRY
_mesa_PauseTransformFeedback(void);
+void GLAPIENTRY
+_mesa_ResumeTransformFeedback_no_error(void);
+
extern void GLAPIENTRY
_mesa_ResumeTransformFeedback(void);