diff options
| author | Samuel Pitoiset <[email protected]> | 2017-05-31 15:52:57 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-07 11:04:16 +0200 |
| commit | a9600318ee044dcac16e7c5251a2a916f39b508f (patch) | |
| tree | 517f802003bbdee5534577674137a2084ac1a211 | |
| parent | d496b879eda3cd05b860fdd69e4cf3e0c1f38b2d (diff) | |
mesa: add KHR_no_error support for glBlitFramebuffer()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_framebuffer_object.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/blit.c | 15 | ||||
| -rw-r--r-- | src/mesa/main/blit.h | 6 |
3 files changed, 22 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml index 76114eb32a2..26f495f8bb9 100644 --- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -271,7 +271,7 @@ <glx vendorpriv="1428"/> </function> - <function name="BlitFramebuffer" es2="3.0"> + <function name="BlitFramebuffer" es2="3.0" no_error="true"> <param name="srcX0" type="GLint"/> <param name="srcY0" type="GLint"/> <param name="srcX1" type="GLint"/> diff --git a/src/mesa/main/blit.c b/src/mesa/main/blit.c index 029b5e16c92..c2efd7bec14 100644 --- a/src/mesa/main/blit.c +++ b/src/mesa/main/blit.c @@ -603,6 +603,21 @@ blit_framebuffer_err(struct gl_context *ctx, * when the samples must be resolved to a single color. */ void GLAPIENTRY +_mesa_BlitFramebuffer_no_error(GLint srcX0, GLint srcY0, GLint srcX1, + GLint srcY1, GLint dstX0, GLint dstY0, + GLint dstX1, GLint dstY1, + GLbitfield mask, GLenum filter) +{ + GET_CURRENT_CONTEXT(ctx); + + blit_framebuffer(ctx, ctx->ReadBuffer, ctx->DrawBuffer, + srcX0, srcY0, srcX1, srcY1, + dstX0, dstY0, dstX1, dstY1, + mask, filter, true, "glBlitFramebuffer"); +} + + +void GLAPIENTRY _mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) diff --git a/src/mesa/main/blit.h b/src/mesa/main/blit.h index 1ca4f830287..6397518dbd3 100644 --- a/src/mesa/main/blit.h +++ b/src/mesa/main/blit.h @@ -34,6 +34,12 @@ _mesa_regions_overlap(int srcX0, int srcY0, int dstX0, int dstY0, int dstX1, int dstY1); +void GLAPIENTRY +_mesa_BlitFramebuffer_no_error(GLint srcX0, GLint srcY0, GLint srcX1, + GLint srcY1, GLint dstX0, GLint dstY0, + GLint dstX1, GLint dstY1, + GLbitfield mask, GLenum filter); + extern void GLAPIENTRY _mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, |