Module: Mesa Branch: master Commit: 4b5140d20bd0461acf90c92060d8a6180555c78a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b5140d20bd0461acf90c92060d8a6180555c78a
Author: Samuel Pitoiset <[email protected]> Date: Thu Aug 24 12:10:57 2017 +0200 mesa: add KHR_no_error support to glResumeTransformFeedback() Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> --- src/mapi/glapi/gen/EXT_transform_feedback.xml | 2 +- src/mesa/main/transformfeedback.c | 8 ++++++++ src/mesa/main/transformfeedback.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml index b5ba580388..7be87f710a 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 02867b5b89..b2cf30cedb 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 645b71862c..930c88a1f2 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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
