[Mesa-dev] [PATCH 6/9] mesa: make _mesa_draw_buffer() static

[Rob Clark]

On Tue, Feb 23, 2016 at 6:45 PM, Brian Paul <brianp at vmware.com> wrote:
>

Reviewed-by: Rob Clark <robdclark at gmail.com>

> ---
>  src/mesa/main/buffers.c | 12 ++++++------
>  src/mesa/main/buffers.h |  3 ---
>  2 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
> index 031b395..3b636aa 100644
> --- a/src/mesa/main/buffers.c
> +++ b/src/mesa/main/buffers.c
> @@ -227,7 +227,7 @@ read_buffer_enum_to_index(GLenum buffer)
>
>
>  /**
> - * Called by glDrawBuffer().
> + * Called by glDrawBuffer() and glNamedFramebufferDrawBuffer().
>   * Specify which renderbuffer(s) to draw into for the first color output.
>   * <buffer> can name zero, one, two or four renderbuffers!
>   * \sa _mesa_DrawBuffers
> @@ -248,9 +248,9 @@ read_buffer_enum_to_index(GLenum buffer)
>   *
>   * See the GL_EXT_framebuffer_object spec for more info.
>   */
> -void
> -_mesa_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
> -                  GLenum buffer, const char *caller)
> +static void
> +draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
> +            GLenum buffer, const char *caller)
>  {
>     GLbitfield destMask;
>
> @@ -299,7 +299,7 @@ void GLAPIENTRY
>  _mesa_DrawBuffer(GLenum buffer)
>  {
>     GET_CURRENT_CONTEXT(ctx);
> -   _mesa_draw_buffer(ctx, ctx->DrawBuffer, buffer, "glDrawBuffer");
> +   draw_buffer(ctx, ctx->DrawBuffer, buffer, "glDrawBuffer");
>  }
>
>
> @@ -318,7 +318,7 @@ _mesa_NamedFramebufferDrawBuffer(GLuint framebuffer, GLenum buf)
>     else
>        fb = ctx->WinSysDrawBuffer;
>
> -   _mesa_draw_buffer(ctx, fb, buf, "glNamedFramebufferDrawBuffer");
> +   draw_buffer(ctx, fb, buf, "glNamedFramebufferDrawBuffer");
>  }
>
>
> diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
> index a57bd15..a58ed3b 100644
> --- a/src/mesa/main/buffers.h
> +++ b/src/mesa/main/buffers.h
> @@ -39,9 +39,6 @@
>  struct gl_context;
>  struct gl_framebuffer;
>
> -extern void
> -_mesa_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
> -                  GLenum buffer, const char *caller);
>
>  extern void GLAPIENTRY
>  _mesa_DrawBuffer( GLenum mode );
> --
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev