summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-08-24 12:02:40 +0200
committerSamuel Pitoiset <[email protected]>2017-08-25 11:35:29 +0200
commit08cecec3c0053ea9b95ac38a05da672bf05af19a (patch)
tree4d94bafc9314052a53c4952b441ce4ef361eca4a /src
parent654587696b4234d09a6b471b70e9629cf2887c27 (diff)
mesa: add KHR_no_error support to glEndTransformFeedback()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/GL3x.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/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index 54e99e7db92..3a1bfb8fa2c 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -210,7 +210,7 @@
<param name="mode" type="GLenum"/>
</function>
- <function name="EndTransformFeedback" es2="3.0">
+ <function name="EndTransformFeedback" es2="3.0" no_error="true">
</function>
<function name="BindBufferRange" es2="3.0" no_error="true">
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index d1d695ce485..8e6ea9c9ca2 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -512,6 +512,14 @@ end_transform_feedback(struct gl_context *ctx,
void GLAPIENTRY
+_mesa_EndTransformFeedback_no_error(void)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ end_transform_feedback(ctx, ctx->TransformFeedback.CurrentObject);
+}
+
+
+void GLAPIENTRY
_mesa_EndTransformFeedback(void)
{
struct gl_transform_feedback_object *obj;
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index 6f28d817ab6..148a7767be1 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -59,6 +59,9 @@ _mesa_BeginTransformFeedback_no_error(GLenum mode);
extern void GLAPIENTRY
_mesa_BeginTransformFeedback(GLenum mode);
+void GLAPIENTRY
+_mesa_EndTransformFeedback_no_error(void);
+
extern void GLAPIENTRY
_mesa_EndTransformFeedback(void);