summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/sis
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-10-05 01:48:07 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-10-05 01:48:07 +0000
commita9fc8ba756dd25a07dc19058fe60f65bda82a055 (patch)
treeaa863fa82d93ea468d6c16e3db6fa74ad1ffb5cb /src/mesa/drivers/dri/sis
parent91802fdf730451aaa0246f514f6778ffaef92c50 (diff)
In gl_texture_image replace IntFormat with InternalFormat and Format with
_BaseFormat to be consistant with gl_renderbuffer.
Diffstat (limited to 'src/mesa/drivers/dri/sis')
-rw-r--r--src/mesa/drivers/dri/sis/sis_tex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_tex.c b/src/mesa/drivers/dri/sis/sis_tex.c
index 5fa8256f1b..a8b4c0e74d 100644
--- a/src/mesa/drivers/dri/sis/sis_tex.c
+++ b/src/mesa/drivers/dri/sis/sis_tex.c
@@ -63,7 +63,7 @@ sisAllocTexImage( sisContextPtr smesa, sisTexObjPtr t, int level,
int size, texel_size;
if (t->format == 0) {
- t->format = image->Format;
+ t->format = image->_BaseFormat;
switch (t->format)
{
case GL_RGBA:
@@ -88,7 +88,7 @@ sisAllocTexImage( sisContextPtr smesa, sisTexObjPtr t, int level,
sis_fatal_error("Bad texture format.\n");
}
}
- assert(t->format == image->Format);
+ assert(t->format == image->_BaseFormat);
texel_size = image->TexFormat->TexelBytes;
size = image->Width * image->Height * texel_size + TEXTURE_HW_PLUS;