X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesa%2Fmain%2Fstate.h;h=7a6cdacf4710b1dda19a7c13106d5ec2a744903c;hb=192de3f051c70ff1404369f88ae2d55f1ffcf806;hp=1352f343266d3d22f7abf9121050fd1a5b6e1543;hpb=5e3bc0c2a2bcdf59949410f94c9b705fc1281ce8;p=mesa.git

diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 1352f343266..7a6cdacf471 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -1,10 +1,7 @@
-/* $Id: state.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  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"),
@@ -19,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -30,21 +28,48 @@
 
 #include "mtypes.h"
 
-
 extern void
-_mesa_init_no_op_table(struct _glapi_table *exec, GLuint tableSize);
+_mesa_update_state(struct gl_context *ctx);
 
+/* As above but can only be called between _mesa_lock_context_textures() and 
+ * _mesa_unlock_context_textures().
+ */
 extern void
-_mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize);
+_mesa_update_state_locked(struct gl_context *ctx);
 
-extern void
-gl_update_state( GLcontext *ctx );
 
 extern void
-gl_print_state( const char *msg, GLuint state );
+_mesa_set_varying_vp_inputs(struct gl_context *ctx, GLbitfield64 varying_inputs);
+
 
 extern void
-gl_print_enable_flags( const char *msg, GLuint flags );
+_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag);
+
+
+/**
+ * Is the secondary color needed?
+ */
+static inline GLboolean
+_mesa_need_secondary_color(const struct gl_context *ctx)
+{
+   if (ctx->Light.Enabled &&
+       ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)
+       return GL_TRUE;
+
+   if (ctx->Fog.ColorSumEnabled)
+      return GL_TRUE;
+
+   if (ctx->VertexProgram._Current &&
+       (ctx->VertexProgram._Current != ctx->VertexProgram._TnlProgram) &&
+       (ctx->VertexProgram._Current->info.inputs_read & VERT_BIT_COLOR1))
+      return GL_TRUE;
+
+   if (ctx->FragmentProgram._Current &&
+       (ctx->FragmentProgram._Current != ctx->FragmentProgram._TexEnvProgram) &&
+       (ctx->FragmentProgram._Current->info.inputs_read & VARYING_BIT_COL1))
+      return GL_TRUE;
 
+   return GL_FALSE;
+}
 
 #endif