Re: [Mesa-dev] [PATCH 13/21] mesa: add KHR_no_error support for glBlitFramebuffer()

[Timothy Arceri]

Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>

On 01/06/17 23:05, Samuel Pitoiset wrote:

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
  src/mapi/glapi/gen/ARB_framebuffer_object.xml |  2 +-
  src/mesa/main/blit.c                          | 15 +++++++++++++++
  src/mesa/main/blit.h                          |  6 ++++++
  3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml 
b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index 76114eb32a..26f495f8bb 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 aa95e9c96c..4e5f7b27bf 100644
--- a/src/mesa/main/blit.c
+++ b/src/mesa/main/blit.c
@@ -569,6 +569,21 @@ blit_framebuffer(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 1ca4f83028..6397518dbd 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,

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev