From ebfcf9de43071e8eab6afe6fba5ee879b72dcbee Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 23 Feb 2016 13:32:21 -0700 Subject: [PATCH] mesa: make _mesa_read_buffer() static Not called from any other file. Remove _mesa_ prefix and update comments. Reviewed-by: Rob Clark Reviewed-by: Roland Scheidegger --- src/mesa/main/buffers.c | 13 +++++++------ src/mesa/main/buffers.h | 4 ---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index 2c4a1386776..031b3955b1d 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -693,12 +693,13 @@ _mesa_readbuffer(struct gl_context *ctx, struct gl_framebuffer *fb, /** - * Called by glReadBuffer to set the source renderbuffer for reading pixels. + * Called by glReadBuffer and glNamedFramebufferReadBuffer to set the source + * renderbuffer for reading pixels. * \param mode color buffer such as GL_FRONT, GL_BACK, etc. */ -void -_mesa_read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, - GLenum buffer, const char *caller) +static void +read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller) { GLbitfield supportedMask; gl_buffer_index srcBuffer; @@ -746,7 +747,7 @@ void GLAPIENTRY _mesa_ReadBuffer(GLenum buffer) { GET_CURRENT_CONTEXT(ctx); - _mesa_read_buffer(ctx, ctx->ReadBuffer, buffer, "glReadBuffer"); + read_buffer(ctx, ctx->ReadBuffer, buffer, "glReadBuffer"); } @@ -765,5 +766,5 @@ _mesa_NamedFramebufferReadBuffer(GLuint framebuffer, GLenum src) else fb = ctx->WinSysReadBuffer; - _mesa_read_buffer(ctx, fb, src, "glNamedFramebufferReadBuffer"); + read_buffer(ctx, fb, src, "glNamedFramebufferReadBuffer"); } diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h index c30cb755cd6..a57bd152d63 100644 --- a/src/mesa/main/buffers.h +++ b/src/mesa/main/buffers.h @@ -73,10 +73,6 @@ extern void _mesa_update_draw_buffers(struct gl_context *ctx); -extern void -_mesa_read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, - GLenum buffer, const char *caller); - extern void GLAPIENTRY _mesa_ReadBuffer( GLenum mode ); -- 2.30.2