From 52c5d9c5b785831c9f7af9444f9a7cda01da06ce Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <rscheidegger@gmx.ch>
Date: Fri, 9 Jun 2006 00:28:53 +0000
Subject: [PATCH] shuffle some code to make some assertions in the
 _savage_texstore_a111xxxx functions compile without error...

---
 src/mesa/drivers/dri/savage/savagetex.c | 83 ++++++++++++++-----------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c
index f0fe0c52594..719e50f964c 100644
--- a/src/mesa/drivers/dri/savage/savagetex.c
+++ b/src/mesa/drivers/dri/savage/savagetex.c
@@ -527,6 +527,51 @@ savageAllocTexObj( struct gl_texture_object *texObj )
  * formats that promote to ARGB8888 or ARGB4444 and set the color
  * components to white. This way we get the correct result.
  */
+
+static GLboolean
+_savage_texstore_a1114444(TEXSTORE_PARAMS);
+
+static GLboolean
+_savage_texstore_a1118888(TEXSTORE_PARAMS);
+
+static struct gl_texture_format _savage_texformat_a1114444 = {
+    MESA_FORMAT_ARGB4444,		/* MesaFormat */
+    GL_RGBA,				/* BaseFormat */
+    GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+    4,					/* RedBits */
+    4,					/* GreenBits */
+    4,					/* BlueBits */
+    4,					/* AlphaBits */
+    0,					/* LuminanceBits */
+    0,					/* IntensityBits */
+    0,					/* IndexBits */
+    0,					/* DepthBits */
+    0,					/* StencilBits */
+    2,					/* TexelBytes */
+    _savage_texstore_a1114444,		/* StoreTexImageFunc */
+    NULL, NULL, NULL, NULL, NULL, NULL  /* FetchTexel* filled in by 
+					 * savageDDInitTextureFuncs */
+};
+static struct gl_texture_format _savage_texformat_a1118888 = {
+    MESA_FORMAT_ARGB8888,		/* MesaFormat */
+    GL_RGBA,				/* BaseFormat */
+    GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
+    8,					/* RedBits */
+    8,					/* GreenBits */
+    8,					/* BlueBits */
+    8,					/* AlphaBits */
+    0,					/* LuminanceBits */
+    0,					/* IntensityBits */
+    0,					/* IndexBits */
+    0,					/* DepthBits */
+    0,					/* StencilBits */
+    4,					/* TexelBytes */
+    _savage_texstore_a1118888,		/* StoreTexImageFunc */
+    NULL, NULL, NULL, NULL, NULL, NULL  /* FetchTexel* filled in by 
+					 * savageDDInitTextureFuncs */
+};
+
+
 static GLboolean
 _savage_texstore_a1114444(TEXSTORE_PARAMS)
 {
@@ -605,44 +650,6 @@ _savage_texstore_a1118888(TEXSTORE_PARAMS)
 }
 
 
-static struct gl_texture_format _savage_texformat_a1114444 = {
-    MESA_FORMAT_ARGB4444,		/* MesaFormat */
-    GL_RGBA,				/* BaseFormat */
-    GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
-    4,					/* RedBits */
-    4,					/* GreenBits */
-    4,					/* BlueBits */
-    4,					/* AlphaBits */
-    0,					/* LuminanceBits */
-    0,					/* IntensityBits */
-    0,					/* IndexBits */
-    0,					/* DepthBits */
-    0,					/* StencilBits */
-    2,					/* TexelBytes */
-    _savage_texstore_a1114444,		/* StoreTexImageFunc */
-    NULL, NULL, NULL, NULL, NULL, NULL  /* FetchTexel* filled in by 
-					 * savageDDInitTextureFuncs */
-};
-static struct gl_texture_format _savage_texformat_a1118888 = {
-    MESA_FORMAT_ARGB8888,		/* MesaFormat */
-    GL_RGBA,				/* BaseFormat */
-    GL_UNSIGNED_NORMALIZED_ARB,		/* DataType */
-    8,					/* RedBits */
-    8,					/* GreenBits */
-    8,					/* BlueBits */
-    8,					/* AlphaBits */
-    0,					/* LuminanceBits */
-    0,					/* IntensityBits */
-    0,					/* IndexBits */
-    0,					/* DepthBits */
-    0,					/* StencilBits */
-    4,					/* TexelBytes */
-    _savage_texstore_a1118888,		/* StoreTexImageFunc */
-    NULL, NULL, NULL, NULL, NULL, NULL  /* FetchTexel* filled in by 
-					 * savageDDInitTextureFuncs */
-};
-
-
 /* Called by the _mesa_store_teximage[123]d() functions. */
 static const struct gl_texture_format *
 savageChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
-- 
2.30.2