diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-06-26 17:12:18 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-06-28 10:25:13 +0200 |
| commit | 352adb53db342a5b9042680a5e81ffbca1b2a417 (patch) | |
| tree | c79116a1720d6f2409de9a486527e34101be24c8 | |
| parent | 91fcba99147c487370ce8ea8ca65f8734174c7d9 (diff) | |
mesa: add KHR_no_error support for gl*ReadBuffer()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/buffers.c | 33 | ||||
| -rw-r--r-- | src/mesa/main/buffers.h | 5 |
4 files changed, 40 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index 6226aa0b9d..d848f78d62 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -197,7 +197,7 @@ <param name="bufs" type="const GLenum *" /> </function> - <function name="NamedFramebufferReadBuffer"> + <function name="NamedFramebufferReadBuffer" no_error="true"> <param name="framebuffer" type="GLuint" /> <param name="buf" type="GLenum" /> </function> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 4833d52010..d281095250 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -2626,7 +2626,7 @@ <glx rop="170" large="true"/> </function> - <function name="ReadBuffer" es2="3.0"> + <function name="ReadBuffer" es2="3.0" no_error="true"> <param name="mode" type="GLenum"/> <glx rop="171"/> </function> diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index 18e46adf84..6359e1b51f 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -801,6 +801,22 @@ read_buffer_err(struct gl_context *ctx, struct gl_framebuffer *fb, } +static void +read_buffer_no_error(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller) +{ + read_buffer(ctx, fb, buffer, caller, true); +} + + +void GLAPIENTRY +_mesa_ReadBuffer_no_error(GLenum buffer) +{ + GET_CURRENT_CONTEXT(ctx); + read_buffer_no_error(ctx, ctx->ReadBuffer, buffer, "glReadBuffer"); +} + + void GLAPIENTRY _mesa_ReadBuffer(GLenum buffer) { @@ -810,6 +826,23 @@ _mesa_ReadBuffer(GLenum buffer) void GLAPIENTRY +_mesa_NamedFramebufferReadBuffer_no_error(GLuint framebuffer, GLenum src) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_framebuffer *fb; + + if (framebuffer) { + fb = _mesa_lookup_framebuffer(ctx, framebuffer); + } else { + fb = ctx->WinSysReadBuffer; + } + + read_buffer_no_error(ctx, fb, src, "glNamedFramebufferReadBuffer"); +} + + +void GLAPIENTRY _mesa_NamedFramebufferReadBuffer(GLuint framebuffer, GLenum src) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h index 9df0815468..ba06138017 100644 --- a/src/mesa/main/buffers.h +++ b/src/mesa/main/buffers.h @@ -65,10 +65,15 @@ _mesa_readbuffer(struct gl_context *ctx, struct gl_framebuffer *fb, extern void _mesa_update_draw_buffers(struct gl_context *ctx); +void GLAPIENTRY +_mesa_ReadBuffer_no_error(GLenum mode); extern void GLAPIENTRY _mesa_ReadBuffer( GLenum mode ); +void GLAPIENTRY +_mesa_NamedFramebufferReadBuffer_no_error(GLuint framebuffer, GLenum src); + extern void GLAPIENTRY _mesa_NamedFramebufferReadBuffer(GLuint framebuffer, GLenum src); |