mesa: NULL-out unused texformat field initializers

diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index e3ac37999c157766171ab57c306eec10523c3f24..cee1b468af4e4bcb4d331642ce30545d71f99a7d 100644 (file)
--- 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 c880119c3cd3e956dfbf04b90f640e4a248eea8c..14046bd266c853edf5ed57a4e61f8df1afa785de 100644 (file)
--- 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 */
 };