svga: always link with C++

[mesa.git] / src / mesa / main / texcompress_fxt1.h

diff --git a/src/mesa/main/texcompress_fxt1.h b/src/mesa/main/texcompress_fxt1.h
index 38048b26ccb4fe46c65012ae22347b4d665d707d..5949df90f0efdf7a1e1ed06376dd6068f2dd6ac8 100644 (file)
--- a/src/mesa/main/texcompress_fxt1.h
+++ b/src/mesa/main/texcompress_fxt1.h
@@ -26,11 +26,9 @@
 #define TEXCOMPRESS_FXT1_H
 
 #include "glheader.h"
+#include "mfeatures.h"
 #include "texstore.h"
 
-struct gl_texture_image;
-
-#if FEATURE_texture_fxt1
 
 extern GLboolean
 _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
@@ -38,24 +36,8 @@ _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
 extern GLboolean
 _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS);
 
-extern void
-_mesa_fetch_texel_2d_f_rgba_fxt1(const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-
-extern void
-_mesa_fetch_texel_2d_f_rgb_fxt1(const struct gl_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 */
+compressed_fetch_func
+_mesa_get_fxt_fetch_func(gl_format format);
 
 #endif /* TEXCOMPRESS_FXT1_H */