From ff57b0f037a45b0d5ced38234f0a8b29d32e7f9d Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 16 Jan 2012 10:54:19 -0700 Subject: [PATCH] swrast: make _swrast_get_values(), _swrast_get_row() static They were only called from in s_span.c --- src/mesa/swrast/s_span.c | 24 ++++++++++++------------ src/mesa/swrast/s_span.h | 11 ----------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 3d3ec57..beadbeb 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1404,10 +1404,10 @@ _swrast_read_rgba_span( struct gl_context *ctx, struct gl_renderbuffer *rb, * \param valueSize is the size in bytes of each value (pixel) put into the * values array. */ -void -_swrast_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb, - GLuint count, const GLint x[], const GLint y[], - void *values, GLuint valueSize) +static void +get_values(struct gl_context *ctx, struct gl_renderbuffer *rb, + GLuint count, const GLint x[], const GLint y[], + void *values, GLuint valueSize) { GLuint i, inCount = 0, inStart = 0; @@ -1440,10 +1440,10 @@ _swrast_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb, * Wrapper for gl_renderbuffer::GetRow() which does clipping. * \param valueSize size of each value (pixel) in bytes */ -void -_swrast_get_row(struct gl_context *ctx, struct gl_renderbuffer *rb, - GLuint count, GLint x, GLint y, - GLvoid *values, GLuint valueSize) +static void +get_row(struct gl_context *ctx, struct gl_renderbuffer *rb, + GLuint count, GLint x, GLint y, + GLvoid *values, GLuint valueSize) { GLint skip = 0; @@ -1487,12 +1487,12 @@ _swrast_get_dest_rgba(struct gl_context *ctx, struct gl_renderbuffer *rb, /* Get destination values from renderbuffer */ if (span->arrayMask & SPAN_XY) { - _swrast_get_values(ctx, rb, span->end, span->array->x, span->array->y, - rbPixels, pixelSize); + get_values(ctx, rb, span->end, span->array->x, span->array->y, + rbPixels, pixelSize); } else { - _swrast_get_row(ctx, rb, span->end, span->x, span->y, - rbPixels, pixelSize); + get_row(ctx, rb, span->end, span->x, span->y, + rbPixels, pixelSize); } return rbPixels; diff --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h index 1663831..e39ae85 100644 --- a/src/mesa/swrast/s_span.h +++ b/src/mesa/swrast/s_span.h @@ -203,17 +203,6 @@ extern void _swrast_read_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint n, GLint x, GLint y, GLvoid *rgba); -extern void -_swrast_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb, - GLuint count, const GLint x[], const GLint y[], - void *values, GLuint valueSize); - -extern void -_swrast_get_row(struct gl_context *ctx, struct gl_renderbuffer *rb, - GLuint count, GLint x, GLint y, - GLvoid *values, GLuint valueSize); - - extern void * _swrast_get_dest_rgba(struct gl_context *ctx, struct gl_renderbuffer *rb, SWspan *span); -- 2.7.4