X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexstate.h;h=7cc3d2c19cef4df8d37dc608b50c7b59a2875cca;hb=263581bba4d61291c54313648063a30c47106f0b;hp=6950b2112988c8d4770dd5fe312b7eb871bb7ab4;hpb=85d816028a2472e0378afda65e7ab6f7ff4d76b4;p=mesa.git

diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 6950b211298..7cc3d2c19ce 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -1,8 +1,11 @@
-/* $Id: texstate.h,v 1.9 2002/06/17 23:36:31 brianp Exp $ */
+/**
+ * \file texstate.h
+ * Texture state management.
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  5.1
  *
  * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
@@ -35,94 +38,98 @@
 extern void
 _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst );
 
+extern void
+_mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
 
-/*** Called from API ***/
 
-extern void
+/**
+ * \name Called from API
+ */
+/*@{*/
+
+extern void GLAPIENTRY
 _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexLevelParameterfv( GLenum target, GLint level,
                               GLenum pname, GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
                               GLenum pname, GLint *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params );
 
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexEnvf( GLenum target, GLenum pname, GLfloat param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexEnvi( GLenum target, GLenum pname, GLint param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param );
 
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexParameterf( GLenum target, GLenum pname, GLfloat param );
 
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexParameteri( GLenum target, GLenum pname, GLint param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexParameteriv( GLenum target, GLenum pname, const GLint *params );
 
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexGend( GLenum coord, GLenum pname, GLdouble param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexGendv( GLenum coord, GLenum pname, const GLdouble *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexGenf( GLenum coord, GLenum pname, GLfloat param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexGeni( GLenum coord, GLenum pname, GLint param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_TexGeniv( GLenum coord, GLenum pname, const GLint *params );
 
 
-
-
 /*
  * GL_ARB_multitexture
  */
-extern void
+extern void GLAPIENTRY
 _mesa_ActiveTextureARB( GLenum target );
 
-extern void
+extern void GLAPIENTRY
 _mesa_ClientActiveTextureARB( GLenum target );
 
 
@@ -130,38 +137,56 @@ _mesa_ClientActiveTextureARB( GLenum target );
  * Pixel Texture Extensions
  */
 
-extern void
+extern void GLAPIENTRY
 _mesa_PixelTexGenSGIX(GLenum mode);
 
-extern void
+extern void GLAPIENTRY
 _mesa_PixelTexGenParameterfSGIS(GLenum target, GLfloat value);
 
 #ifdef VMS
 #define _mesa_PixelTexGenParameterfvSGIS _mesa_PixelTexGenParameterfv
 #endif
-extern void
+extern void GLAPIENTRY
 _mesa_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value);
 
-extern void
+extern void GLAPIENTRY
 _mesa_PixelTexGenParameteriSGIS(GLenum target, GLint value);
 
 #ifdef VMS
 #define _mesa_PixelTexGenParameterivSGIS _mesa_PixelTexGenParameteriv
 #endif
-extern void
+extern void GLAPIENTRY
 _mesa_PixelTexGenParameterivSGIS(GLenum target, const GLint *value);
 
 #ifdef VMS
 #define _mesa_GetPixelTexGenParameterfvSGIS _mesa_GetPixelTexGenParameterfv
 #endif
-extern void
+extern void GLAPIENTRY
 _mesa_GetPixelTexGenParameterfvSGIS(GLenum target, GLfloat *value);
 
 #ifdef VMS
 #define _mesa_GetPixelTexGenParameterivSGIS _mesa_GetPixelTexGenParameteriv
 #endif
-extern void
+extern void GLAPIENTRY
 _mesa_GetPixelTexGenParameterivSGIS(GLenum target, GLint *value);
 
+/*@}*/
+
+
+/**
+ * \name Initialization, state maintenance
+ */
+/*@{*/
+
+extern void 
+_mesa_update_texture( GLcontext *ctx, GLuint new_state );
+
+extern GLboolean
+_mesa_init_texture( GLcontext *ctx );
+
+extern void 
+_mesa_free_texture_data( GLcontext *ctx );
+
+/*@}*/
 
 #endif