X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fstate.h;h=b3ea28d09687efca25a27011ebd6a3b0e594def9;hb=8a4114b9294c8e8f5bb977be47cc7764c9cdf490;hp=7ff1c5b59b396a6e14d6c5eb071dc2c5cc8c331d;hpb=113e8167de4500ea8b12176a938cbc4753f3a923;p=mesa.git

diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 7ff1c5b59b3..b3ea28d0968 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.3
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -17,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.
  */
 
 
@@ -39,17 +39,35 @@ _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?
  */
-static INLINE GLboolean
+static inline GLboolean
 _mesa_need_secondary_color(const struct gl_context *ctx)
 {
    if (ctx->Light.Enabled &&
@@ -61,27 +79,53 @@ _mesa_need_secondary_color(const struct gl_context *ctx)
 
    if (ctx->VertexProgram._Current &&
        (ctx->VertexProgram._Current != ctx->VertexProgram._TnlProgram) &&
-       (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_COLOR1))
+       (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->Base.InputsRead & FRAG_BIT_COL1))
+       (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;
 }
 
+static inline bool
+_mesa_arb_vertex_program_enabled(const struct gl_context *ctx)
+{
+   return ctx->VertexProgram.Enabled &&
+          ctx->VertexProgram.Current->arb.Instructions;
+}
 
-/**
- * Is RGBA LogicOp enabled?
- */
-static INLINE GLboolean
-_mesa_rgba_logicop_enabled(const struct gl_context *ctx)
+/** Compute two sided lighting state for fixed function or programs. */
+static inline bool
+_mesa_vertex_program_two_side_enabled(const struct gl_context *ctx)
 {
-   return ctx->Color.ColorLogicOpEnabled;
+   if (ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX] ||
+       _mesa_arb_vertex_program_enabled(ctx))
+      return ctx->VertexProgram.TwoSideEnabled;
+
+   return ctx->Light.Enabled && ctx->Light.Model.TwoSide;
 }
 
+/** Return 0=GL_CCW or 1=GL_CW */
+static inline bool
+_mesa_polygon_get_front_bit(const struct gl_context *ctx)
+{
+   if (ctx->Transform.ClipOrigin == GL_LOWER_LEFT)
+      return ctx->Polygon.FrontFace == GL_CW;
+
+   return ctx->Polygon.FrontFace == GL_CCW;
+}
 
+static inline bool
+_mesa_arb_fragment_program_enabled(const struct gl_context *ctx)
+{
+   return ctx->FragmentProgram.Enabled &&
+          ctx->FragmentProgram.Current->arb.Instructions;
+}
 
 #endif