cosmetic changes;

[mesa.git] / src / mesa / tnl / t_vb_texmat.c

diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c
index 363a76a48761aad57e2e37391ff42e0e7395869c..00330b689aebb9aa8abfe3a9df15ce5856ed6468 100644 (file)
--- a/src/mesa/tnl/t_vb_texmat.c
+++ b/src/mesa/tnl/t_vb_texmat.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -57,7 +57,7 @@ static void check_texmat( GLcontext *ctx, struct tnl_pipeline_stage *stage )
    GLuint i;
    stage->active = 0;
 
-   if (ctx->Texture._TexMatEnabled && !ctx->VertexProgram.Enabled) {
+   if (ctx->Texture._TexMatEnabled && !ctx->VertexProgram._Enabled) {
       GLuint flags = 0;
 
       for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++)
@@ -128,7 +128,7 @@ static void free_texmat_data( struct tnl_pipeline_stage *stage )
         if (store->texcoord[i].data)
            _mesa_vector4f_free( &store->texcoord[i] );
       FREE( store );
-      stage->privatePtr = 0;
+      stage->privatePtr = NULL;
    }
 }
 
@@ -137,7 +137,7 @@ static void free_texmat_data( struct tnl_pipeline_stage *stage )
 const struct tnl_pipeline_stage _tnl_texture_transform_stage =
 {
    "texture transform",                        /* name */
-   _NEW_TEXTURE|_NEW_TEXTURE_MATRIX,   /* check_state */
+   _NEW_TEXTURE|_NEW_TEXTURE_MATRIX|_NEW_PROGRAM,      /* check_state */
    _NEW_TEXTURE|_NEW_TEXTURE_MATRIX,   /* run_state */
    GL_FALSE,                           /* active? */
    0,                                  /* inputs */