mesa: move some helper functions from fboobject.c to glformats.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 a9ddce9a8cb493c944bafb872829584dc97039b1..2a8b8d6538cf616f75ef8116513174a2df4c6cb4 100644 (file)
--- a/src/mesa/main/texcompress_fxt1.h
+++ b/src/mesa/main/texcompress_fxt1.h
@@ -25,6 +25,12 @@
 #ifndef TEXCOMPRESS_FXT1_H
 #define TEXCOMPRESS_FXT1_H
 
+#include "glheader.h"
+#include "mfeatures.h"
+#include "texstore.h"
+
+struct swrast_texture_image;
+
 extern GLboolean
 _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
 
@@ -32,20 +38,11 @@ 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);
 
-
 #endif /* TEXCOMPRESS_FXT1_H */