diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-07-20 11:07:57 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-08-02 12:54:31 +0200 |
| commit | 9a0b2033822cbc15181710ec80b2163447553038 (patch) | |
| tree | f2220d7e3710ffa46363116f2598e8c2cf125a11 | |
| parent | e1750e0a179ff50a7c3603d1003445a608d4cb6c (diff) | |
mesa: add KHR_no_error support to glBeginConditionalRender()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
| -rw-r--r-- | src/mapi/glapi/gen/GL3x.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/condrender.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/condrender.h | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index e55b5bbe65e..63a57ebc1e2 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -246,7 +246,7 @@ <!-- These functions alias ones from GL_NV_conditional_render --> - <function name="BeginConditionalRender"> + <function name="BeginConditionalRender" no_error="true"> <param name="query" type="GLuint"/> <param name="mode" type="GLenum"/> </function> diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 95d6d6ad5f0..24a7f4b6945 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -105,6 +105,14 @@ begin_conditional_render(struct gl_context *ctx, GLuint queryId, GLenum mode, void GLAPIENTRY +_mesa_BeginConditionalRender_no_error(GLuint queryId, GLenum mode) +{ + GET_CURRENT_CONTEXT(ctx); + begin_conditional_render(ctx, queryId, mode, true); +} + + +void GLAPIENTRY _mesa_BeginConditionalRender(GLuint queryId, GLenum mode) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/condrender.h b/src/mesa/main/condrender.h index 90d7fb722c7..6b761d1a1b0 100644 --- a/src/mesa/main/condrender.h +++ b/src/mesa/main/condrender.h @@ -31,6 +31,9 @@ #include "context.h" +void GLAPIENTRY +_mesa_BeginConditionalRender_no_error(GLuint queryId, GLenum mode); + extern void GLAPIENTRY _mesa_BeginConditionalRender(GLuint queryId, GLenum mode); |