diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-20 11:10:41 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-08-02 12:54:31 +0200 |
| commit | 71064d34aa3bb87e7bdfe805edf3eef6a137ee05 (patch) | |
| tree | 8f0a0b0bc5efefe0e0c15451ea93f9204e529c40 | |
| parent | 4ded964fed944e76e5c1aef149839567513e5909 (diff) | |
mesa: add KHR_no_error support to glEndConditionalRender()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -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 63a57ebc1e2..d6040faa3e2 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -251,7 +251,7 @@ <param name="mode" type="GLenum"/> </function> - <function name="EndConditionalRender"> + <function name="EndConditionalRender" no_error="true"> </function> <!-- These functions alias ones from GL_EXT_gpu_shader4 --> diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 051cd8f9629..320003aa73f 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -147,6 +147,14 @@ end_conditional_render(struct gl_context *ctx) void APIENTRY +_mesa_EndConditionalRender_no_error(void) +{ + GET_CURRENT_CONTEXT(ctx); + end_conditional_render(ctx); +} + + +void APIENTRY _mesa_EndConditionalRender(void) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/condrender.h b/src/mesa/main/condrender.h index 6b761d1a1b0..e7672512f7e 100644 --- a/src/mesa/main/condrender.h +++ b/src/mesa/main/condrender.h @@ -37,6 +37,9 @@ _mesa_BeginConditionalRender_no_error(GLuint queryId, GLenum mode); extern void GLAPIENTRY _mesa_BeginConditionalRender(GLuint queryId, GLenum mode); +void APIENTRY +_mesa_EndConditionalRender_no_error(void); + extern void APIENTRY _mesa_EndConditionalRender(void); |