summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-08-24 11:41:15 +0200
committerSamuel Pitoiset <[email protected]>2017-08-25 11:24:17 +0200
commitb0590ace75d9f96fe11e53524993915ae0d98346 (patch)
tree082c3f92898a53df03a77aa0628400d56489b0a2
parentefb981168050defefc531ab0eb315a780681a07e (diff)
mesa: add KHR_no_error support to glBindTransformFeedback()
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 bbb44866f91..2f893960c56 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -82,7 +82,7 @@
<enum name="TRANSFORM_FEEDBACK_BUFFER_ACTIVE" value="0x8E24"/>
<enum name="TRANSFORM_FEEDBACK_BINDING" value="0x8E25"/>
- <function name="BindTransformFeedback" es2="3.0">
+ <function name="BindTransformFeedback" es2="3.0" no_error="true">
<param name="target" type="GLenum"/>
<param name="id" type="GLuint"/>
</function>
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index d61db4eb628..307728c3995 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -1080,6 +1080,14 @@ bind_transform_feedback(struct gl_context *ctx, GLuint name, bool no_error)
void GLAPIENTRY
+_mesa_BindTransformFeedback_no_error(GLenum target, GLuint name)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ bind_transform_feedback(ctx, name, true);
+}
+
+
+void GLAPIENTRY
_mesa_BindTransformFeedback(GLenum target, GLuint name)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index c59ade7f0a8..47639bb56fd 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -105,6 +105,9 @@ _mesa_CreateTransformFeedbacks(GLsizei n, GLuint *names);
extern GLboolean GLAPIENTRY
_mesa_IsTransformFeedback(GLuint name);
+void GLAPIENTRY
+_mesa_BindTransformFeedback_no_error(GLenum target, GLuint name);
+
extern void GLAPIENTRY
_mesa_BindTransformFeedback(GLenum target, GLuint name);