Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git] / src / mesa / tnl / t_pipeline.c
index 457b160eb95c7f10c1a9cea413ebf14b46081511..357ef1e24b5bf4914fe2b3e3b4e31d86eb314ae3 100644 (file)
@@ -1,10 +1,8 @@
-/* $Id: t_pipeline.c,v 1.7 2000/12/26 05:09:33 keithw Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.3
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  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"),
  * 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.
  *
- * Author:
- *     Keith Whitwell <keithw@valinux.com>
+ * Authors:
+ *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
-#include "context.h"
-#include "mem.h"
-#include "mmath.h"
-#include "state.h"
-#include "mtypes.h"
-
-#include "math/m_translate.h"
-#include "math/m_xform.h"
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/imports.h"
+#include "main/state.h"
+#include "main/mtypes.h"
 
 #include "t_context.h"
 #include "t_pipeline.h"
+#include "t_vp_build.h"
+#include "t_vertex.h"
 
-
-void _tnl_install_pipeline( GLcontext *ctx, 
-                           const struct gl_pipeline_stage **stages )
+void _tnl_install_pipeline( GLcontext *ctx,
+                           const struct tnl_pipeline_stage **stages )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct gl_pipeline *pipe = &tnl->pipeline;
    GLuint i;
 
-   ASSERT(pipe->nr_stages == 0);
-
-   pipe->run_state_changes = ~0;
-   pipe->run_input_changes = ~0;
-   pipe->build_state_changes = ~0;
-   pipe->build_state_trigger = 0;
-   pipe->inputs = 0;
+   tnl->pipeline.new_state = ~0;
 
    /* Create a writeable copy of each stage.
     */
    for (i = 0 ; i < MAX_PIPELINE_STAGES && stages[i] ; i++) {
-      MEMCPY( &pipe->stages[i], stages[i], sizeof( **stages ));
-      pipe->build_state_trigger |= pipe->stages[i].check_state;
+      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
+      MEMCPY(s, stages[i], sizeof(*s));
+      if (s->create)
+        s->create(ctx, s);
    }
 
-   pipe->nr_stages = i;
+   tnl->pipeline.nr_stages = i;
 }
 
 void _tnl_destroy_pipeline( GLcontext *ctx )
@@ -71,86 +61,105 @@ void _tnl_destroy_pipeline( GLcontext *ctx )
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    GLuint i;
 
-   for (i = 0 ; i < tnl->pipeline.nr_stages ; i++) 
-      tnl->pipeline.stages[i].destroy( &tnl->pipeline.stages[i] );
+   for (i = 0 ; i < tnl->pipeline.nr_stages ; i++) {
+      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
+      if (s->destroy)
+        s->destroy(s);
+   }
 
    tnl->pipeline.nr_stages = 0;
 }
 
 
 
-void _tnl_validate_pipeline( GLcontext *ctx )
+static GLuint check_input_changes( GLcontext *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct gl_pipeline *pipe = &tnl->pipeline;
-   struct gl_pipeline_stage *stage = pipe->stages;
-   GLuint newstate = pipe->build_state_changes;
-   GLuint generated = 0;
    GLuint i;
-
-   pipe->inputs = 0;
-   pipe->build_state_changes = 0;
-
-   for (i = 0 ; i < pipe->nr_stages ; i++) {
-      if (stage[i].check_state & newstate) {
-        stage[i].check(ctx, &stage[i]);
+   
+   for (i = 0; i <= _TNL_LAST_MAT; i++) {
+      if (tnl->vb.AttribPtr[i]->size != tnl->pipeline.last_attrib_size[i] ||
+         tnl->vb.AttribPtr[i]->stride != tnl->pipeline.last_attrib_stride[i]) {
+        tnl->pipeline.last_attrib_size[i] = tnl->vb.AttribPtr[i]->size;
+        tnl->pipeline.last_attrib_stride[i] = tnl->vb.AttribPtr[i]->stride;
+        tnl->pipeline.input_changes |= 1<<i;
       }
-
-      if (stage[i].active) {
-        pipe->inputs |= stage[i].inputs & ~generated;
-        generated |= stage[i].outputs;
-      } 
    }
+
+   if (tnl->pipeline.input_changes &&
+      tnl->Driver.NotifyInputChanges) 
+      tnl->Driver.NotifyInputChanges( ctx, tnl->pipeline.input_changes );
+
+   return tnl->pipeline.input_changes;
 }
 
 
+static GLuint check_output_changes( GLcontext *ctx )
+{
+#if 0
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   
+   for (i = 0; i < VERT_RESULT_MAX; i++) {
+      if (tnl->vb.ResultPtr[i]->size != tnl->last_result_size[i] ||
+         tnl->vb.ResultPtr[i]->stride != tnl->last_result_stride[i]) {
+        tnl->last_result_size[i] = tnl->vb.ResultPtr[i]->size;
+        tnl->last_result_stride[i] = tnl->vb.ResultPtr[i]->stride;
+        tnl->pipeline.output_changes |= 1<<i;
+      }
+   }
+
+   if (tnl->pipeline.output_changes) 
+      tnl->Driver.NotifyOutputChanges( ctx, tnl->pipeline.output_changes );
+   
+   return tnl->pipeline.output_changes;
+#else
+   return ~0;
+#endif
+}
 
 
 void _tnl_run_pipeline( GLcontext *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
-   struct gl_pipeline *pipe = &tnl->pipeline;
-   struct gl_pipeline_stage *stage = pipe->stages;
-   GLuint changed_state = pipe->run_state_changes;
-   GLuint changed_inputs = pipe->run_input_changes;
-   GLboolean running = GL_TRUE;
-   GLuint i;
-
    unsigned short __tmp;
+   GLuint i;
 
-   /* Done elsewhere.
-    */
-   ASSERT(pipe->build_state_changes == 0);
-
-   START_FAST_MATH(__tmp);
+   if (!tnl->vb.Count)
+      return;
 
-   /* If something changes in the pipeline, tag all subsequent stages
-    * using this value for recalculation.  
-    *
-    * Even inactive stages have their state and inputs examined to try
-    * to keep cached data alive over state-changes. 
+   /* Check for changed input sizes or change in stride to/from zero
+    * (ie const or non-const).
     */
-   for (i = 0 ; i < pipe->nr_stages ; i++) {
-      
-      stage[i].changed_inputs |= stage[i].inputs & changed_inputs;
-
-      if (stage[i].run_state & changed_state) {
-        stage[i].changed_inputs = stage[i].inputs;
+   if (check_input_changes( ctx ) || tnl->pipeline.new_state) {
+      if (ctx->VertexProgram._MaintainTnlProgram)
+        _tnl_UpdateFixedFunctionProgram( ctx );
+
+      for (i = 0; i < tnl->pipeline.nr_stages ; i++) {
+        struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
+        if (s->validate)
+           s->validate( ctx, s );
       }
+      
+      tnl->pipeline.new_state = 0;
+      tnl->pipeline.input_changes = 0;
+      
+      /* Pipeline can only change its output in response to either a
+       * statechange or an input size/stride change.  No other changes
+       * are allowed.
+       */
+      if (check_output_changes( ctx ))
+        _tnl_notify_pipeline_output_change( ctx );
+   }
 
-      if (stage[i].active) {
-        if (stage[i].changed_inputs)
-           changed_inputs |= stage[i].outputs;
+   START_FAST_MATH(__tmp);
 
-        if (running) {
-           running = stage[i].run( ctx, &stage[i] );
-        }
-      }
+   for (i = 0; i < tnl->pipeline.nr_stages ; i++) {
+      struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
+      if (!s->run( ctx, s ))
+        break;
    }
-   END_FAST_MATH(__tmp);
 
-   pipe->run_state_changes = 0;
-   pipe->run_input_changes = 0;
+   END_FAST_MATH(__tmp);
 }
 
 
@@ -159,9 +168,9 @@ void _tnl_run_pipeline( GLcontext *ctx )
  * simple hardware rasterizers.  For customization, I don't recommend
  * tampering with the internals of these stages in the way that
  * drivers did in Mesa 3.4.  These stages are basically black boxes,
- * and should be left intact.  
+ * and should be left intact.
  *
- * To customize the pipeline, consider: 
+ * To customize the pipeline, consider:
  *
  * - removing redundant stages (making sure that the software rasterizer
  *   can cope with this on fallback paths).  An example is fog
@@ -177,25 +186,30 @@ void _tnl_run_pipeline( GLcontext *ctx )
  *
  * - inserting optimized (but specialized) stages ahead of the
  *   general-purpose fallback implementation.  For example, the old
- *   fastpath mechanism, which only works when the VERT_ELT input is
+ *   fastpath mechanism, which only works when the VB->Elts input is
  *   available, can be duplicated by placing the fastpath stage at the
  *   head of this pipeline.  Such specialized stages are currently
  *   constrained to have no outputs (ie. they must either finish the *
  *   pipeline by returning GL_FALSE from run(), or do nothing).
  *
  * Some work can be done to lift some of the restrictions in the final
- * case, if it becomes necessary to do so. 
+ * case, if it becomes necessary to do so.
  */
-const struct gl_pipeline_stage *_tnl_default_pipeline[] = {
-   &_tnl_update_material_stage, 
-   &_tnl_vertex_transform_stage, 
-   &_tnl_normal_transform_stage, 
-   &_tnl_lighting_stage, 
-   &_tnl_fog_coordinate_stage, 
-   &_tnl_texgen_stage, 
-   &_tnl_texture_transform_stage, 
-   &_tnl_point_attenuation_stage, 
+const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
+   &_tnl_vertex_transform_stage,
+   &_tnl_normal_transform_stage,
+   &_tnl_lighting_stage,
+   &_tnl_texgen_stage,
+   &_tnl_texture_transform_stage,
+   &_tnl_point_attenuation_stage,
+   &_tnl_vertex_program_stage, 
+   &_tnl_fog_coordinate_stage,
    &_tnl_render_stage,
-   0
+   NULL 
 };
 
+const struct tnl_pipeline_stage *_tnl_vp_pipeline[] = {
+   &_tnl_vertex_program_stage,
+   &_tnl_render_stage,
+   NULL
+};