From: Brian Paul <brianp@vmware.com>
Date: Mon, 28 Sep 2009 00:28:48 +0000 (-0600)
Subject: mesa: NULL-out unused texformat field initializers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9525b92efbe0d2b44b3b5518464ca28575188bf7;p=mesa.git

mesa: NULL-out unused texformat field initializers
---

diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index e3ac37999c1..cee1b468af4 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -240,12 +240,12 @@ const struct gl_texture_format _mesa_texformat_rgb_fxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgb_fxt1,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   _mesa_fetch_texel_2d_rgb_fxt1, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_rgb_fxt1, 		/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -264,12 +264,12 @@ const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgba_fxt1,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   _mesa_fetch_texel_2d_rgba_fxt1, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_rgba_fxt1, 		/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index c880119c3cd..14046bd266c 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -581,12 +581,12 @@ const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgb_dxt1,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgb_dxt1, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_rgb_dxt1, 	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -605,12 +605,12 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgba_dxt1,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgba_dxt1, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_rgba_dxt1, 	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -629,12 +629,12 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgba_dxt3,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgba_dxt3, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_rgba_dxt3, 	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -653,12 +653,12 @@ const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgba_dxt5,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
-   fetch_texel_2d_rgba_dxt5, 		/* FetchTexel2D */
+   NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_rgba_dxt5, 	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -678,12 +678,12 @@ const struct gl_texture_format _mesa_texformat_srgb_dxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgb_dxt1,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_srgb_dxt1,	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -702,12 +702,12 @@ const struct gl_texture_format _mesa_texformat_srgba_dxt1 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgba_dxt1,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_srgba_dxt1, 	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -726,12 +726,12 @@ const struct gl_texture_format _mesa_texformat_srgba_dxt3 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgba_dxt3,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_srgba_dxt3, 	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
@@ -750,12 +750,12 @@ const struct gl_texture_format _mesa_texformat_srgba_dxt5 = {
    0,					/* DepthBits */
    0,					/* StencilBits */
    0,					/* TexelBytes */
-   _mesa_texstore_rgba_dxt5,		/* StoreTexImageFunc */
+   NULL,				/* StoreTexImageFunc */
    NULL, /*impossible*/ 		/* FetchTexel1D */
    NULL, 				/* FetchTexel2D */
    NULL, /*impossible*/ 		/* FetchTexel3D */
    NULL, /*impossible*/ 		/* FetchTexel1Df */
-   _mesa_fetch_texel_2d_f_srgba_dxt5, 	/* FetchTexel2Df */
+   NULL, 				/* FetchTexel2Df */
    NULL, /*impossible*/ 		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };