X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexcompress.h;h=19b08bbadf62ae3d8e9746fae46ec5e06d298fe9;hb=7f48278edc70ad0841cbee2c46add7653b4fac15;hp=5b5e64e15dd945154f97f6709df2d9a688adb811;hpb=c3c19be8e0d0b13916cc128cf3c8e839935c912a;p=mesa.git

diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index 5b5e64e15dd..19b08bbadf6 100644
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -25,47 +25,32 @@
 #ifndef TEXCOMPRESS_H
 #define TEXCOMPRESS_H
 
-#include "mtypes.h"
+#include "formats.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
-#if _HAVE_FULL_GL
-
-extern GLuint
-_mesa_get_compressed_formats( GLcontext *ctx, GLint *formats );
+struct gl_context;
 
-extern GLuint
-_mesa_compressed_texture_size( GLcontext *ctx,
-                               GLsizei width, GLsizei height, GLsizei depth,
-                               GLuint mesaFormat );
+#if _HAVE_FULL_GL
 
 extern GLuint
-_mesa_compressed_texture_size_glenum(GLcontext *ctx,
-                                     GLsizei width, GLsizei height,
-                                     GLsizei depth, GLenum glformat);
+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all);
 
-extern GLint
-_mesa_compressed_row_stride(GLuint mesaFormat, GLsizei width);
+extern gl_format
+_mesa_glenum_to_compressed_format(GLenum format);
 
+extern GLenum
+_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat);
 
 extern GLubyte *
 _mesa_compressed_image_address(GLint col, GLint row, GLint img,
-                               GLuint mesaFormat,
+                               gl_format mesaFormat,
                                GLsizei width, const GLubyte *image);
 
-
-extern void
-_mesa_init_texture_s3tc( GLcontext *ctx );
-
-extern void
-_mesa_init_texture_fxt1( GLcontext *ctx );
-
-
 #else /* _HAVE_FULL_GL */
 
 /* no-op macros */
 #define _mesa_get_compressed_formats( c, f ) 0
-#define _mesa_compressed_texture_size( c, w, h, d, f ) 0
-#define _mesa_compressed_texture_size_glenum( c, w, h, d, f ) 0
-#define _mesa_compressed_row_stride( f, w) 0
 #define _mesa_compressed_image_address(c, r, i, f, w, i2 ) 0
 #define _mesa_compress_teximage( c, w, h, sF, s, sRS, dF, d, drs ) ((void)0)