X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexcompress_fxt1.h;h=bd84082e9ed3ea2b5eca208d94d680025cd39e8b;hb=f609cf782ab5e90ddf045dc4b0da8cebf99be0d1;hp=b74f955fcd62a233d96c105a4bb855ab32eab755;hpb=cccdc43fa9a8c49cdbdb545de8ff91c528b1ed47;p=mesa.git

diff --git a/src/mesa/main/texcompress_fxt1.h b/src/mesa/main/texcompress_fxt1.h
index b74f955fcd6..bd84082e9ed 100644
--- a/src/mesa/main/texcompress_fxt1.h
+++ b/src/mesa/main/texcompress_fxt1.h
@@ -25,8 +25,14 @@
 #ifndef TEXCOMPRESS_FXT1_H
 #define TEXCOMPRESS_FXT1_H
 
+#include "glheader.h"
+#include "mfeatures.h"
 #include "texstore.h"
 
+struct swrast_texture_image;
+
+#if FEATURE_texture_fxt1
+
 extern GLboolean
 _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
 
@@ -34,20 +40,23 @@ extern GLboolean
 _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS);
 
 extern void
-_mesa_fetch_texel_2d_rgba_fxt1(const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLchan *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rgba_fxt1(const struct gl_texture_image *texImage,
+_mesa_fetch_texel_2d_f_rgba_fxt1(const struct swrast_texture_image *texImage,
                                  GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_rgb_fxt1(const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLchan *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rgb_fxt1(const struct gl_texture_image *texImage,
+_mesa_fetch_texel_2d_f_rgb_fxt1(const struct swrast_texture_image *texImage,
                                 GLint i, GLint j, GLint k, GLfloat *texel);
 
+#else /* FEATURE_texture_fxt1 */
+
+/* these are used only in texstore_funcs[] */
+#define _mesa_texstore_rgb_fxt1 NULL
+#define _mesa_texstore_rgba_fxt1 NULL
+
+/* these are used only in texfetch_funcs[] */
+#define _mesa_fetch_texel_2d_f_rgba_fxt1 NULL
+#define _mesa_fetch_texel_2d_f_rgb_fxt1 NULL
+
+#endif /* FEATURE_texture_fxt1 */
 
 #endif /* TEXCOMPRESS_FXT1_H */