aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-02-01 22:46:31 -0700
committerIan Romanick <[email protected]>2012-02-02 10:07:14 -0700
commit2e8f8cb383320b83ba5d85c27808ac2d841834e6 (patch)
treefb4119ce03176f72ca91b7dd1946f3500cde1755 /src/mesa/main
parent5c341b7df3c1058d586629394e53e9e26ae2cc01 (diff)
mesa: Fix copy-and-paste error in _mesa_pack_rgba_span_float
GL_RG_INTEGER only has two components, not three. I'll be surprised if anyone ever tries to glReadPixels(..., GL_SHORT, GL_RG_INTEGER, ...). This was found by inspection. NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/pack.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index d07e2aaa87a..41485a1bf06 100644
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -1175,9 +1175,8 @@ _mesa_pack_rgba_span_float(struct gl_context *ctx, GLuint n, GLfloat rgba[][4],
break;
case GL_RG_INTEGER:
for (i=0;i<n;i++) {
- dst[i*3+0] = (GLshort) rgba[i][RCOMP];
- dst[i*3+1] = (GLshort) rgba[i][GCOMP];
- dst[i*3+2] = (GLshort) rgba[i][BCOMP];
+ dst[i*2+0] = (GLshort) rgba[i][RCOMP];
+ dst[i*2+1] = (GLshort) rgba[i][GCOMP];
}
break;
case GL_RGB_INTEGER_EXT: