diff options
| author | Brian Paul <[email protected]> | 2012-01-16 10:54:13 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-01-24 14:12:06 -0700 |
| commit | 267fb178844d3f17503dd0f921791f3ab059c4e7 (patch) | |
| tree | 99ce8888e59c0bebb25fd2efdf079d2da4d38ea8 /src | |
| parent | 64be85540f30e904784c6a72f2ba2784d5ccb36d (diff) | |
swrast: remove dstType param from _swrast_read_rgba_span()
It was always GL_FLOAT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/swrast/s_copypix.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.c | 8 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index 1e0f9fe7d1f..13fc36cf9ed 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -148,7 +148,7 @@ copy_rgba_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, p = tmpImage; for (row = 0; row < height; row++) { _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer, - width, srcx, sy + row, GL_FLOAT, p ); + width, srcx, sy + row, p ); p += width * 4; } p = tmpImage; @@ -172,7 +172,7 @@ copy_rgba_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, else { /* get from framebuffer */ _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer, - width, srcx, sy, GL_FLOAT, rgba ); + width, srcx, sy, rgba ); } if (transferOps) { diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index f91b6c25e53..3d3ec57d397 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1324,16 +1324,16 @@ end: /** - * Read RGBA pixels from a renderbuffer. Clipping will be done to prevent - * reading ouside the buffer's boundaries. - * \param dstType datatype for returned colors + * Read float RGBA pixels from a renderbuffer. Clipping will be done to + * prevent reading ouside the buffer's boundaries. * \param rgba the returned colors */ void _swrast_read_rgba_span( struct gl_context *ctx, struct gl_renderbuffer *rb, - GLuint n, GLint x, GLint y, GLenum dstType, + GLuint n, GLint x, GLint y, GLvoid *rgba) { + GLenum dstType = GL_FLOAT; const GLint bufWidth = (GLint) rb->Width; const GLint bufHeight = (GLint) rb->Height; diff --git a/src/mesa/swrast/s_span.h b/src/mesa/swrast/s_span.h index e8f76873d8c..16638312c99 100644 --- a/src/mesa/swrast/s_span.h +++ b/src/mesa/swrast/s_span.h @@ -201,7 +201,7 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span); extern void _swrast_read_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb, - GLuint n, GLint x, GLint y, GLenum type, GLvoid *rgba); + GLuint n, GLint x, GLint y, GLvoid *rgba); extern void _swrast_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb, |