X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexcompress_etc.h;h=319b7bea7154a7faa30ead618f234d0a996ccd1a;hb=edd50828618ed2efe799013c2723d67c407d86b4;hp=09d62de81bc7a92655b874691cd171dd121d691a;hpb=ad3e39bb6dcb139c3eb6a460833f30ba0fb3e974;p=mesa.git

diff --git a/src/mesa/main/texcompress_etc.h b/src/mesa/main/texcompress_etc.h
index 09d62de81bc..319b7bea715 100644
--- a/src/mesa/main/texcompress_etc.h
+++ b/src/mesa/main/texcompress_etc.h
@@ -26,13 +26,10 @@
 
 #include <inttypes.h>
 #include "glheader.h"
-#include "mfeatures.h"
 #include "texcompress.h"
 #include "texstore.h"
 
 
-struct swrast_texture_image;
-
 GLboolean
 _mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS);
 
@@ -66,50 +63,6 @@ _mesa_texstore_etc2_rgb8_punchthrough_alpha1(TEXSTORE_PARAMS);
 GLboolean
 _mesa_texstore_etc2_srgb8_punchthrough_alpha1(TEXSTORE_PARAMS);
 
-void
-_mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_rgb8(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_srgb8(const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel);
-
-void
-_mesa_fetch_texel_2d_f_etc2_rgba8_eac(const struct swrast_texture_image *texImage,
-                                      GLint i, GLint j, GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_srgb8_alpha8_eac(const struct
-                                            swrast_texture_image *texImage,
-                                            GLint i, GLint j,
-                                            GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_r11_eac(const struct swrast_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_rg11_eac(const struct swrast_texture_image *texImage,
-                                     GLint i, GLint j, GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_signed_r11_eac(const struct
-                                           swrast_texture_image *texImage,
-                                           GLint i, GLint j,
-                                           GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_signed_rg11_eac(const struct
-                                            swrast_texture_image *texImage,
-                                            GLint i, GLint j,
-                                            GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_rgb8_punchthrough_alpha1(
-                                 const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j,
-                                 GLint k, GLfloat *texel);
-void
-_mesa_fetch_texel_2d_f_etc2_srgb8_punchthrough_alpha1(
-                                 const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j,
-                                 GLint k, GLfloat *texel);
 void
 _mesa_etc1_unpack_rgba8888(uint8_t *dst_row,
                            unsigned dst_stride,
@@ -124,9 +77,9 @@ _mesa_unpack_etc2_format(uint8_t *dst_row,
                          unsigned src_stride,
                          unsigned src_width,
                          unsigned src_height,
-                         gl_format format);
+                         mesa_format format);
 
 compressed_fetch_func
-_mesa_get_etc_fetch_func(gl_format format);
+_mesa_get_etc_fetch_func(mesa_format format);
 
 #endif