summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-08-24 14:50:11 +0200
committerSamuel Pitoiset <[email protected]>2017-08-25 11:35:30 +0200
commit83690d45908010b484d3314fd4133d9fff849a92 (patch)
tree63300d7be8c89d316dfe484668c9f1f8555e0a70
parenta5319d9fde79937ac467007951f358ab1a08176b (diff)
mesa: add KHR_no_error support to glTransformFeedbackVaryings()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/GL3x.xml2
-rw-r--r--src/mesa/main/transformfeedback.c11
-rw-r--r--src/mesa/main/transformfeedback.h5
3 files changed, 17 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index 3a1bfb8fa2c..750bc023033 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -227,7 +227,7 @@
<param name="buffer" type="GLuint"/>
</function>
- <function name="TransformFeedbackVaryings" es2="3.0">
+ <function name="TransformFeedbackVaryings" es2="3.0" no_error="true">
<param name="program" type="GLuint"/>
<param name="count" type="GLsizei"/>
<param name="varyings" type="const GLchar * const *"/>
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index b529834fc70..b79b41d35ef 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -869,6 +869,17 @@ transform_feedback_varyings(struct gl_context *ctx,
void GLAPIENTRY
+_mesa_TransformFeedbackVaryings_no_error(GLuint program, GLsizei count,
+ const GLchar *const *varyings,
+ GLenum bufferMode)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, program);
+ transform_feedback_varyings(ctx, shProg, count, varyings, bufferMode);
+}
+
+void GLAPIENTRY
_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
const GLchar * const *varyings,
GLenum bufferMode)
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index 930c88a1f2b..cc798878b53 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -82,6 +82,11 @@ extern void GLAPIENTRY
_mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer,
GLintptr offset);
+void GLAPIENTRY
+_mesa_TransformFeedbackVaryings_no_error(GLuint program, GLsizei count,
+ const GLchar *const *varyings,
+ GLenum bufferMode);
+
extern void GLAPIENTRY
_mesa_TransformFeedbackVaryings(GLuint program, GLsizei count,
const GLchar * const *varyings,