summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorHaihao Xiang <haihao.xiang@intel.com>2007-03-17 09:42:36 -0600
committerBrian <brian@yutani.localnet.net>2007-03-17 09:42:36 -0600
commitee5b7f0574c6c5bce9ab75a2825f1fe089a57fa5 (patch)
tree35f710800c00ec3d4421bddf6958288a5212d662 /src/mesa
parent6a9b0cd0b43ba01b24871ec1fa155e192ddeaa56 (diff)
fix some format conversion bugs in glGetTexImage(), bug 10288
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texstore.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 994fb16730..2098bdddbf 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3608,6 +3608,25 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
GLint col;
for (col = 0; col < width; col++) {
(*texImage->FetchTexelf)(texImage, col, row, img, rgba[col]);
+ if (texImage->TexFormat->BaseFormat == GL_ALPHA) {
+ rgba[col][RCOMP] = 0.0;
+ rgba[col][GCOMP] = 0.0;
+ rgba[col][BCOMP] = 0.0;
+ }
+ else if (texImage->TexFormat->BaseFormat == GL_LUMINANCE) {
+ rgba[col][GCOMP] = 0.0;
+ rgba[col][BCOMP] = 0.0;
+ rgba[col][ACOMP] = 1.0;
+ }
+ else if (texImage->TexFormat->BaseFormat == GL_LUMINANCE_ALPHA) {
+ rgba[col][GCOMP] = 0.0;
+ rgba[col][BCOMP] = 0.0;
+ }
+ else if (texImage->TexFormat->BaseFormat == GL_INTENSITY) {
+ rgba[col][GCOMP] = 0.0;
+ rgba[col][BCOMP] = 0.0;
+ rgba[col][ACOMP] = 1.0;
+ }
}
_mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
format, type, dest,