rgba888 -> argb888 and fixed on small typo: a8 -> i8.savage-2-0-0-branch

Set the SAVAGE_NEW_TEXTURE bit in SetTex(Sub)Image2D. Fixes quake3
cinematics.

1 files changed, 9 insertions, 7 deletions

diff --git a/xc/lib/GL/mesa/src/drv/savage/savagetex.c b/xc/lib/GL/mesa/src/drv/savage/savagetex.c
index ac1058381..145fc4e76 100755
--- a/xc/lib/GL/mesa/src/drv/savage/savagetex.c
+++ b/xc/lib/GL/mesa/src/drv/savage/savagetex.c
@@ -535,7 +535,7 @@ savageChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
       case GL_UNSIGNED_SHORT_1_5_5_5_REV:
 	 return &_mesa_texformat_argb1555;
       default:
-         return do32bpt ? &_mesa_texformat_rgba8888 : &_mesa_texformat_argb4444;
+         return do32bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_argb4444;
       }
 
    case 3:
@@ -552,18 +552,18 @@ savageChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
       case GL_UNSIGNED_SHORT_5_6_5_REV:
 	 return &_mesa_texformat_rgb565;
       default:
-         return do32bpt ? &_mesa_texformat_rgba8888 : &_mesa_texformat_rgb565;
+         return do32bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_rgb565;
       }
 
    case GL_RGBA8:
    case GL_RGBA12:
    case GL_RGBA16:
       return !force16bpt ?
-	  &_mesa_texformat_rgba8888 : &_mesa_texformat_argb4444;
+	  &_mesa_texformat_argb8888 : &_mesa_texformat_argb4444;
 
    case GL_RGB10_A2:
       return !force16bpt ?
-	  &_mesa_texformat_rgba8888 : &_mesa_texformat_argb1555;
+	  &_mesa_texformat_argb8888 : &_mesa_texformat_argb1555;
 
    case GL_RGBA4:
    case GL_RGBA2:
@@ -576,7 +576,7 @@ savageChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_RGB10:
    case GL_RGB12:
    case GL_RGB16:
-      return !force16bpt ? &_mesa_texformat_rgba8888 : &_mesa_texformat_rgb565;
+      return !force16bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_rgb565;
 
    case GL_RGB5:
    case GL_RGB4:
@@ -621,7 +621,7 @@ savageChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_LUMINANCE12_ALPHA4:
    case GL_LUMINANCE12_ALPHA12:
    case GL_LUMINANCE16_ALPHA16:
-      return !force16bpt ? &_mesa_texformat_rgba8888 : &_mesa_texformat_argb4444;
+      return !force16bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_argb4444;
 
    case GL_INTENSITY:
    case GL_COMPRESSED_INTENSITY:
@@ -632,7 +632,7 @@ savageChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
    case GL_INTENSITY8:
    case GL_INTENSITY12:
    case GL_INTENSITY16:
-      return isSavage4 ? &_mesa_texformat_a8 : (
+      return isSavage4 ? &_mesa_texformat_i8 : (
 	 !force16bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_argb4444);
 /*
    case GL_COLOR_INDEX:
@@ -1867,6 +1867,7 @@ static void savageTexImage2D( GLcontext *ctx, GLenum target, GLint level,
 			   width, height, border, format, type,
 			   pixels, packing, texObj, texImage );
    t->dirty_images |= (1 << level);
+   SAVAGE_CONTEXT(ctx)->new_state |= SAVAGE_NEW_TEXTURE;
 }
 
 static void savageTexSubImage2D( GLcontext *ctx, 
@@ -1895,6 +1896,7 @@ static void savageTexSubImage2D( GLcontext *ctx,
 			     height, format, type, pixels, packing, texObj,
 			     texImage);
    t->dirty_images |= (1 << level);
+   SAVAGE_CONTEXT(ctx)->new_state |= SAVAGE_NEW_TEXTURE;
 }
 
 static void savageTexParameter( GLcontext *ctx, GLenum target,