diff options
| author | Gareth Hughes <[email protected]> | 2001-03-28 21:36:31 +0000 |
|---|---|---|
| committer | Gareth Hughes <[email protected]> | 2001-03-28 21:36:31 +0000 |
| commit | 16a8e986cebae6560d00992b6b9f54549e1d03c6 (patch) | |
| tree | 7cd0d5527effe3b5a15ef5832bd82309ee604133 /src/mesa/drivers | |
| parent | d082417daeb3f8a35a490eb44b6c88463289fa5d (diff) | |
- Restore texImage->IntFormat.
- Fix FX driver texture image conversions.
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 99af41df5da..f15fcf88b60 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -1211,7 +1211,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level, success = GL_FALSE; } else { - success = _mesa_convert_texsubimage2d(mesaTexFormat->IntFormat, + success = _mesa_convert_texsubimage2d(mesaTexFormat->MesaFormat, 0, 0, /* xoffset, yoffset */ mml->width, mml->height, mml->width, /* destImageWidth */ @@ -1256,7 +1256,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level, _mesa_rescale_teximage2d(texFormat, width, height, mml->width, mml->height, tempImage, rescaledImage); - success = _mesa_convert_texsubimage2d(mesaTexFormat->IntFormat, + success = _mesa_convert_texsubimage2d(mesaTexFormat->MesaFormat, 0, 0, /* xoffset, yoffset */ mml->width, mml->height, mml->width, /* destImageWidth */ @@ -1267,7 +1267,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level, FREE(rescaledImage); } else { - success = _mesa_convert_texsubimage2d(mesaTexFormat->IntFormat, + success = _mesa_convert_texsubimage2d(mesaTexFormat->MesaFormat, 0, 0, /* xoffset, yoffset */ mml->width, mml->height, mml->width, /* destImageWidth */ @@ -1326,7 +1326,7 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level, success = GL_FALSE; } else { - success = _mesa_convert_texsubimage2d(texImage->TexFormat->IntFormat, + success = _mesa_convert_texsubimage2d(texImage->TexFormat->MesaFormat, xoffset, yoffset, width, height, mml->width, @@ -1376,7 +1376,7 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level, _mesa_rescale_teximage2d(texImage->TexFormat, width, height, newWidth, newHeight, tempImage, rescaledImage); - success = _mesa_convert_texsubimage2d(texImage->TexFormat->IntFormat, + success = _mesa_convert_texsubimage2d(texImage->TexFormat->MesaFormat, xoffset * wScale, yoffset * hScale, newWidth, newHeight, mml->width, /* destImageWidth */ @@ -1387,13 +1387,13 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level, FREE(rescaledImage); } else { - success = _mesa_convert_texsubimage2d(texImage->TexFormat->IntFormat, - xoffset, yoffset, - width, height, - mml->width, - simpleFormat, CHAN_TYPE, - &_mesa_native_packing, - tempImage, texImage->Data); + success = _mesa_convert_texsubimage2d(texImage->TexFormat->MesaFormat, + xoffset, yoffset, + width, height, + mml->width, + simpleFormat, CHAN_TYPE, + &_mesa_native_packing, + tempImage, texImage->Data); } /* the conversion had better of worked! */ assert(success); |