[Mesa-dev] [PATCH 08/21] mesa: make _mesa_blit_framebuffer() static

Samuel Pitoiset samuel.pitoiset at gmail.com
Thu Jun 1 13:04:57 UTC 2017


Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/mesa/main/blit.c | 29 ++++++++++++++---------------
 src/mesa/main/blit.h |  8 --------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/mesa/main/blit.c b/src/mesa/main/blit.c
index e739130f98..2c0300eab3 100644
--- a/src/mesa/main/blit.c
+++ b/src/mesa/main/blit.c
@@ -177,13 +177,12 @@ is_valid_blit_filter(const struct gl_context *ctx, GLenum filter)
 }
 
 
-void
-_mesa_blit_framebuffer(struct gl_context *ctx,
-                       struct gl_framebuffer *readFb,
-                       struct gl_framebuffer *drawFb,
-                       GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                       GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                       GLbitfield mask, GLenum filter, const char *func)
+static void
+blit_framebuffer(struct gl_context *ctx,
+                 struct gl_framebuffer *readFb, struct gl_framebuffer *drawFb,
+                 GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+                 GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+                 GLbitfield mask, GLenum filter, const char *func)
 {
    const GLbitfield legalMaskBits = (GL_COLOR_BUFFER_BIT |
                                      GL_DEPTH_BUFFER_BIT |
@@ -561,10 +560,10 @@ _mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                   dstX0, dstY0, dstX1, dstY1,
                   mask, _mesa_enum_to_string(filter));
 
-   _mesa_blit_framebuffer(ctx, ctx->ReadBuffer, ctx->DrawBuffer,
-                          srcX0, srcY0, srcX1, srcY1,
-                          dstX0, dstY0, dstX1, dstY1,
-                          mask, filter, "glBlitFramebuffer");
+   blit_framebuffer(ctx, ctx->ReadBuffer, ctx->DrawBuffer,
+                    srcX0, srcY0, srcX1, srcY1,
+                    dstX0, dstY0, dstX1, dstY1,
+                    mask, filter, "glBlitFramebuffer");
 }
 
 
@@ -612,8 +611,8 @@ _mesa_BlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer,
    else
       drawFb = ctx->WinSysDrawBuffer;
 
-   _mesa_blit_framebuffer(ctx, readFb, drawFb,
-                          srcX0, srcY0, srcX1, srcY1,
-                          dstX0, dstY0, dstX1, dstY1,
-                          mask, filter, "glBlitNamedFramebuffer");
+   blit_framebuffer(ctx, readFb, drawFb,
+                    srcX0, srcY0, srcX1, srcY1,
+                    dstX0, dstY0, dstX1, dstY1,
+                    mask, filter, "glBlitNamedFramebuffer");
 }
diff --git a/src/mesa/main/blit.h b/src/mesa/main/blit.h
index 88dd4a9ec8..1ca4f83028 100644
--- a/src/mesa/main/blit.h
+++ b/src/mesa/main/blit.h
@@ -34,14 +34,6 @@ _mesa_regions_overlap(int srcX0, int srcY0,
                       int dstX0, int dstY0,
                       int dstX1, int dstY1);
 
-extern void
-_mesa_blit_framebuffer(struct gl_context *ctx,
-                       struct gl_framebuffer *readFb,
-                       struct gl_framebuffer *drawFb,
-                       GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                       GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                       GLbitfield mask, GLenum filter, const char *func);
-
 extern void GLAPIENTRY
 _mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                          GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-- 
2.13.0



More information about the mesa-dev mailing list