X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ftexstate.h;h=c0b73b14e828ccbeb8d5bd765a46194c3faf5fdd;hb=a96e946d25d4518d1c73c5d9d0f3d147f42bc416;hp=52fe60275c23095d273c9aeb2d9a4659062fe1d9;hpb=a9408f3ca14f2fb6286bd66bad06ee1bde0d8697;p=mesa.git

diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 52fe60275c2..c0b73b14e82 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -32,7 +32,6 @@
 #define TEXSTATE_H
 
 
-#include "compiler.h"
 #include "enums.h"
 #include "macros.h"
 #include "mtypes.h"
@@ -55,6 +54,24 @@ _mesa_get_current_tex_unit(struct gl_context *ctx)
    return _mesa_get_tex_unit(ctx, ctx->Texture.CurrentUnit);
 }
 
+
+/**
+ * Return pointer to current fixed-func texture unit.
+ * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
+ * \return NULL if the current unit is not a fixed-func texture unit
+ */
+static inline struct gl_fixedfunc_texture_unit *
+_mesa_get_current_fixedfunc_tex_unit(struct gl_context *ctx)
+{
+   unsigned unit = ctx->Texture.CurrentUnit;
+
+   if (unit >= ARRAY_SIZE(ctx->Texture.FixedFuncUnit))
+      return NULL;
+
+   return &ctx->Texture.FixedFuncUnit[unit];
+}
+
+
 static inline GLuint
 _mesa_max_tex_unit(struct gl_context *ctx)
 {
@@ -77,6 +94,9 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
  */
 /*@{*/
 
+extern void GLAPIENTRY
+_mesa_ActiveTexture_no_error( GLenum target );
+
 extern void GLAPIENTRY
 _mesa_ActiveTexture( GLenum target );
 
@@ -91,8 +111,11 @@ _mesa_ClientActiveTexture( GLenum target );
  */
 /*@{*/
 
-extern void 
-_mesa_update_texture( struct gl_context *ctx, GLuint new_state );
+extern void
+_mesa_update_texture_matrices(struct gl_context *ctx);
+
+extern void
+_mesa_update_texture_state(struct gl_context *ctx);
 
 extern GLboolean
 _mesa_init_texture( struct gl_context *ctx );