mesa: Use SATURATE

[mesa.git] / src / mesa / main / state.h

diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 9d4591790ae21d0aa8a0d402b3702c1c62545215..fd2877814dd3a2c282c7058e749b1289d4a7f318 100644 (file)
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -28,6 +28,9 @@
 
 #include "mtypes.h"
 
+extern void
+_mesa_update_allow_draw_out_of_order(struct gl_context *ctx);
+
 extern void
 _mesa_update_state(struct gl_context *ctx);
 
@@ -39,12 +42,30 @@ _mesa_update_state_locked(struct gl_context *ctx);
 
 
 extern void
-_mesa_set_varying_vp_inputs(struct gl_context *ctx, GLbitfield varying_inputs);
+_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag);
 
 
+/**
+ * Update ctx->VertexProgram._VPMode.
+ */
 extern void
-_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag);
+_mesa_update_vertex_processing_mode(struct gl_context *ctx);
+
 
+/**
+ * Set the _DrawVAO and the net enabled arrays.
+ */
+void
+_mesa_set_draw_vao(struct gl_context *ctx, struct gl_vertex_array_object *vao,
+                   GLbitfield filter);
+
+
+static inline bool
+_mesa_ati_fragment_shader_enabled(const struct gl_context *ctx)
+{
+   return ctx->ATIFragmentShader.Enabled &&
+          ctx->ATIFragmentShader.Current->Instructions[0];
+}
 
 /**
  * Is the secondary color needed?
@@ -69,6 +90,9 @@ _mesa_need_secondary_color(const struct gl_context *ctx)
        (ctx->FragmentProgram._Current->info.inputs_read & VARYING_BIT_COL1))
       return GL_TRUE;
 
+   if (_mesa_ati_fragment_shader_enabled(ctx))
+      return GL_TRUE;
+
    return GL_FALSE;
 }
 
@@ -107,11 +131,4 @@ _mesa_arb_fragment_program_enabled(const struct gl_context *ctx)
           ctx->FragmentProgram.Current->arb.Instructions;
 }
 
-static inline bool
-_mesa_ati_fragment_shader_enabled(const struct gl_context *ctx)
-{
-   return ctx->ATIFragmentShader.Enabled &&
-          ctx->ATIFragmentShader.Current->Instructions[0];
-}
-
 #endif