mesa git update 30 Mar 2011

1 files changed, 280 insertions, 274 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
index 4fad1f297..250cbb226 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -1,274 +1,280 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * 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"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * 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 NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.

- * 

- **************************************************************************/

-

- /*

-  * Authors:

-  *   Keith Whitwell <keith@tungstengraphics.com>

-  */

- 

-#include "main/macros.h"

-#include "st_context.h"

-#include "st_atom.h"

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "cso_cache/cso_context.h"

-

-

-static GLuint translate_fill( GLenum mode )

-{

-   switch (mode) {

-   case GL_POINT:

-      return PIPE_POLYGON_MODE_POINT;

-   case GL_LINE:

-      return PIPE_POLYGON_MODE_LINE;

-   case GL_FILL:

-      return PIPE_POLYGON_MODE_FILL;

-   default:

-      assert(0);

-      return 0;

-   }

-}

-

-

-

-static void update_raster_state( struct st_context *st )

-{

-   struct gl_context *ctx = st->ctx;

-   struct pipe_rasterizer_state *raster = &st->state.rasterizer;

-   const struct gl_vertex_program *vertProg = ctx->VertexProgram._Current;

-   const struct gl_fragment_program *fragProg = ctx->FragmentProgram._Current;

-   uint i;

-

-   memset(raster, 0, sizeof(*raster));

-

-   /* _NEW_POLYGON, _NEW_BUFFERS

-    */

-   {

-      raster->front_ccw = (ctx->Polygon.FrontFace == GL_CCW);

-

-      /*

-       * Gallium's surfaces are Y=0=TOP orientation.  OpenGL is the

-       * opposite.  Window system surfaces are Y=0=TOP.  Mesa's FBOs

-       * must match OpenGL conventions so FBOs use Y=0=BOTTOM.  In that

-       * case, we must invert Y and flip the notion of front vs. back.

-       */

-      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM) {

-         /* Drawing to an FBO.  The viewport will be inverted. */

-         raster->front_ccw ^= 1;

-      }

-   }

-

-   /* _NEW_LIGHT

-    */

-   if (ctx->Light.ShadeModel == GL_FLAT)

-      raster->flatshade = 1;

-

-   if (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION_EXT)

-      raster->flatshade_first = 1;

-

-   /* _NEW_LIGHT | _NEW_PROGRAM

-    *

-    * Back-face colors can come from traditional lighting (when

-    * GL_LIGHT_MODEL_TWO_SIDE is set) or from vertex programs/shaders (when

-    * GL_VERTEX_PROGRAM_TWO_SIDE is set).  Note the logic here.

-    */

-   if (ctx->VertexProgram._Current) {

-      if (ctx->VertexProgram._Enabled ||

-          (ctx->Shader.CurrentVertexProgram &&

-           ctx->Shader.CurrentVertexProgram->LinkStatus)) {

-         /* user-defined vertex program or shader */

-         raster->light_twoside = ctx->VertexProgram.TwoSideEnabled;

-      }

-      else {

-         /* TNL-generated program */

-         raster->light_twoside = ctx->Light.Enabled && ctx->Light.Model.TwoSide;

-      }

-   }

-   else if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) {

-      raster->light_twoside = 1;

-   }

-

-   /* _NEW_POLYGON

-    */

-   if (ctx->Polygon.CullFlag) {

-      switch (ctx->Polygon.CullFaceMode) {

-      case GL_FRONT:

-	 raster->cull_face = PIPE_FACE_FRONT;

-         break;

-      case GL_BACK:

-	 raster->cull_face = PIPE_FACE_BACK;

-         break;

-      case GL_FRONT_AND_BACK:

-	 raster->cull_face = PIPE_FACE_FRONT_AND_BACK;

-         break;

-      }

-   }

-   else {

-      raster->cull_face = PIPE_FACE_NONE;

-   }

-

-   /* _NEW_POLYGON

-    */

-   {

-      raster->fill_front = translate_fill( ctx->Polygon.FrontMode );

-      raster->fill_back = translate_fill( ctx->Polygon.BackMode );

-

-      /* Simplify when culling is active:

-       */

-      if (raster->cull_face & PIPE_FACE_FRONT) {

-	 raster->fill_front = raster->fill_back;

-      }

-      

-      if (raster->cull_face & PIPE_FACE_BACK) {

-	 raster->fill_back = raster->fill_front;

-      }

-   }

-

-   /* _NEW_POLYGON 

-    */

-   if (ctx->Polygon.OffsetUnits != 0.0 ||

-       ctx->Polygon.OffsetFactor != 0.0) {

-      raster->offset_point = ctx->Polygon.OffsetPoint;

-      raster->offset_line = ctx->Polygon.OffsetLine;

-      raster->offset_tri = ctx->Polygon.OffsetFill;

-   }

-

-   if (ctx->Polygon.OffsetPoint ||

-       ctx->Polygon.OffsetLine ||

-       ctx->Polygon.OffsetFill) {

-      raster->offset_units = ctx->Polygon.OffsetUnits;

-      raster->offset_scale = ctx->Polygon.OffsetFactor;

-   }

-

-   if (ctx->Polygon.SmoothFlag)

-      raster->poly_smooth = 1;

-

-   if (ctx->Polygon.StippleFlag)

-      raster->poly_stipple_enable = 1;

-

-   /* _NEW_POINT

-    */

-   raster->point_size = ctx->Point.Size;

-

-   if (!ctx->Point.PointSprite && ctx->Point.SmoothFlag)

-      raster->point_smooth = 1;

-

-   /* _NEW_POINT | _NEW_PROGRAM

-    */

-   if (ctx->Point.PointSprite) {

-      /* origin */

-      if ((ctx->Point.SpriteOrigin == GL_UPPER_LEFT) ^

-          (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM))

-         raster->sprite_coord_mode = PIPE_SPRITE_COORD_UPPER_LEFT;

-      else 

-         raster->sprite_coord_mode = PIPE_SPRITE_COORD_LOWER_LEFT;

-

-      /* Coord replacement flags.  If bit 'k' is set that means

-       * that we need to replace GENERIC[k] attrib with an automatically

-       * computed texture coord.

-       */

-      for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {

-         if (ctx->Point.CoordReplace[i]) {

-            raster->sprite_coord_enable |= 1 << i;

-         }

-      }

-      if (fragProg->Base.InputsRead & FRAG_BIT_PNTC) {

-         raster->sprite_coord_enable |=

-            1 << (FRAG_ATTRIB_PNTC - FRAG_ATTRIB_TEX0);

-      }

-

-      raster->point_quad_rasterization = 1;

-   }

-

-   /* ST_NEW_VERTEX_PROGRAM

-    */

-   if (vertProg) {

-      if (vertProg->Base.Id == 0) {

-         if (vertProg->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) {

-            /* generated program which emits point size */

-            raster->point_size_per_vertex = TRUE;

-         }

-      }

-      else if (ctx->VertexProgram.PointSizeEnabled) {

-         /* user-defined program and GL_VERTEX_PROGRAM_POINT_SIZE set */

-         raster->point_size_per_vertex = ctx->VertexProgram.PointSizeEnabled;

-      }

-   }

-   if (!raster->point_size_per_vertex) {

-      /* clamp size now */

-      raster->point_size = CLAMP(ctx->Point.Size,

-                                 ctx->Point.MinSize,

-                                 ctx->Point.MaxSize);

-   }

-

-   /* _NEW_LINE

-    */

-   raster->line_smooth = ctx->Line.SmoothFlag;

-   if (ctx->Line.SmoothFlag) {

-      raster->line_width = CLAMP(ctx->Line.Width,

-                                ctx->Const.MinLineWidthAA,

-                                ctx->Const.MaxLineWidthAA);

-   }

-   else {

-      raster->line_width = CLAMP(ctx->Line.Width,

-                                ctx->Const.MinLineWidth,

-                                ctx->Const.MaxLineWidth);

-   }

-

-   raster->line_stipple_enable = ctx->Line.StippleFlag;

-   raster->line_stipple_pattern = ctx->Line.StipplePattern;

-   /* GL stipple factor is in [1,256], remap to [0, 255] here */

-   raster->line_stipple_factor = ctx->Line.StippleFactor - 1;

-

-   /* _NEW_MULTISAMPLE */

-   if (ctx->Multisample._Enabled || st->force_msaa)

-      raster->multisample = 1;

-

-   /* _NEW_SCISSOR */

-   if (ctx->Scissor.Enabled)

-      raster->scissor = 1;

-

-   raster->gl_rasterization_rules = 1;

-

-   cso_set_rasterizer(st->cso_context, raster);

-}

-

-const struct st_tracked_state st_update_rasterizer = {

-   "st_update_rasterizer",    /* name */

-   {

-      (_NEW_BUFFERS |

-       _NEW_LIGHT |

-       _NEW_LINE |

-       _NEW_MULTISAMPLE |

-       _NEW_POINT |

-       _NEW_POLYGON |

-       _NEW_PROGRAM |

-       _NEW_SCISSOR),      /* mesa state dependencies*/

-      ST_NEW_VERTEX_PROGRAM,  /* state tracker dependencies */

-   },

-   update_raster_state     /* update function */

-};

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  */
+ 
+#include "main/macros.h"
+#include "st_context.h"
+#include "st_atom.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "cso_cache/cso_context.h"
+
+
+static GLuint translate_fill( GLenum mode )
+{
+   switch (mode) {
+   case GL_POINT:
+      return PIPE_POLYGON_MODE_POINT;
+   case GL_LINE:
+      return PIPE_POLYGON_MODE_LINE;
+   case GL_FILL:
+      return PIPE_POLYGON_MODE_FILL;
+   default:
+      assert(0);
+      return 0;
+   }
+}
+
+
+
+static void update_raster_state( struct st_context *st )
+{
+   struct gl_context *ctx = st->ctx;
+   struct pipe_rasterizer_state *raster = &st->state.rasterizer;
+   const struct gl_vertex_program *vertProg = ctx->VertexProgram._Current;
+   const struct gl_fragment_program *fragProg = ctx->FragmentProgram._Current;
+   uint i;
+
+   memset(raster, 0, sizeof(*raster));
+
+   /* _NEW_POLYGON, _NEW_BUFFERS
+    */
+   {
+      raster->front_ccw = (ctx->Polygon.FrontFace == GL_CCW);
+
+      /*
+       * Gallium's surfaces are Y=0=TOP orientation.  OpenGL is the
+       * opposite.  Window system surfaces are Y=0=TOP.  Mesa's FBOs
+       * must match OpenGL conventions so FBOs use Y=0=BOTTOM.  In that
+       * case, we must invert Y and flip the notion of front vs. back.
+       */
+      if (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM) {
+         /* Drawing to an FBO.  The viewport will be inverted. */
+         raster->front_ccw ^= 1;
+      }
+   }
+
+   /* _NEW_LIGHT
+    */
+   if (ctx->Light.ShadeModel == GL_FLAT)
+      raster->flatshade = 1;
+
+   if (ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION_EXT)
+      raster->flatshade_first = 1;
+
+   /* _NEW_LIGHT | _NEW_PROGRAM
+    *
+    * Back-face colors can come from traditional lighting (when
+    * GL_LIGHT_MODEL_TWO_SIDE is set) or from vertex programs/shaders (when
+    * GL_VERTEX_PROGRAM_TWO_SIDE is set).  Note the logic here.
+    */
+   if (ctx->VertexProgram._Current) {
+      if (ctx->VertexProgram._Enabled ||
+          (ctx->Shader.CurrentVertexProgram &&
+           ctx->Shader.CurrentVertexProgram->LinkStatus)) {
+         /* user-defined vertex program or shader */
+         raster->light_twoside = ctx->VertexProgram.TwoSideEnabled;
+      }
+      else {
+         /* TNL-generated program */
+         raster->light_twoside = ctx->Light.Enabled && ctx->Light.Model.TwoSide;
+      }
+   }
+   else if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) {
+      raster->light_twoside = 1;
+   }
+
+   raster->clamp_vertex_color = ctx->Light._ClampVertexColor;
+
+   /* _NEW_POLYGON
+    */
+   if (ctx->Polygon.CullFlag) {
+      switch (ctx->Polygon.CullFaceMode) {
+      case GL_FRONT:
+	 raster->cull_face = PIPE_FACE_FRONT;
+         break;
+      case GL_BACK:
+	 raster->cull_face = PIPE_FACE_BACK;
+         break;
+      case GL_FRONT_AND_BACK:
+	 raster->cull_face = PIPE_FACE_FRONT_AND_BACK;
+         break;
+      }
+   }
+   else {
+      raster->cull_face = PIPE_FACE_NONE;
+   }
+
+   /* _NEW_POLYGON
+    */
+   {
+      raster->fill_front = translate_fill( ctx->Polygon.FrontMode );
+      raster->fill_back = translate_fill( ctx->Polygon.BackMode );
+
+      /* Simplify when culling is active:
+       */
+      if (raster->cull_face & PIPE_FACE_FRONT) {
+	 raster->fill_front = raster->fill_back;
+      }
+      
+      if (raster->cull_face & PIPE_FACE_BACK) {
+	 raster->fill_back = raster->fill_front;
+      }
+   }
+
+   /* _NEW_POLYGON 
+    */
+   if (ctx->Polygon.OffsetUnits != 0.0 ||
+       ctx->Polygon.OffsetFactor != 0.0) {
+      raster->offset_point = ctx->Polygon.OffsetPoint;
+      raster->offset_line = ctx->Polygon.OffsetLine;
+      raster->offset_tri = ctx->Polygon.OffsetFill;
+   }
+
+   if (ctx->Polygon.OffsetPoint ||
+       ctx->Polygon.OffsetLine ||
+       ctx->Polygon.OffsetFill) {
+      raster->offset_units = ctx->Polygon.OffsetUnits;
+      raster->offset_scale = ctx->Polygon.OffsetFactor;
+   }
+
+   if (ctx->Polygon.SmoothFlag)
+      raster->poly_smooth = 1;
+
+   if (ctx->Polygon.StippleFlag)
+      raster->poly_stipple_enable = 1;
+
+   /* _NEW_POINT
+    */
+   raster->point_size = ctx->Point.Size;
+
+   if (!ctx->Point.PointSprite && ctx->Point.SmoothFlag)
+      raster->point_smooth = 1;
+
+   /* _NEW_POINT | _NEW_PROGRAM
+    */
+   if (ctx->Point.PointSprite) {
+      /* origin */
+      if ((ctx->Point.SpriteOrigin == GL_UPPER_LEFT) ^
+          (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM))
+         raster->sprite_coord_mode = PIPE_SPRITE_COORD_UPPER_LEFT;
+      else 
+         raster->sprite_coord_mode = PIPE_SPRITE_COORD_LOWER_LEFT;
+
+      /* Coord replacement flags.  If bit 'k' is set that means
+       * that we need to replace GENERIC[k] attrib with an automatically
+       * computed texture coord.
+       */
+      for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) {
+         if (ctx->Point.CoordReplace[i]) {
+            raster->sprite_coord_enable |= 1 << i;
+         }
+      }
+      if (fragProg->Base.InputsRead & FRAG_BIT_PNTC) {
+         raster->sprite_coord_enable |=
+            1 << (FRAG_ATTRIB_PNTC - FRAG_ATTRIB_TEX0);
+      }
+
+      raster->point_quad_rasterization = 1;
+   }
+
+   /* ST_NEW_VERTEX_PROGRAM
+    */
+   if (vertProg) {
+      if (vertProg->Base.Id == 0) {
+         if (vertProg->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) {
+            /* generated program which emits point size */
+            raster->point_size_per_vertex = TRUE;
+         }
+      }
+      else if (ctx->VertexProgram.PointSizeEnabled) {
+         /* user-defined program and GL_VERTEX_PROGRAM_POINT_SIZE set */
+         raster->point_size_per_vertex = ctx->VertexProgram.PointSizeEnabled;
+      }
+   }
+   if (!raster->point_size_per_vertex) {
+      /* clamp size now */
+      raster->point_size = CLAMP(ctx->Point.Size,
+                                 ctx->Point.MinSize,
+                                 ctx->Point.MaxSize);
+   }
+
+   /* _NEW_LINE
+    */
+   raster->line_smooth = ctx->Line.SmoothFlag;
+   if (ctx->Line.SmoothFlag) {
+      raster->line_width = CLAMP(ctx->Line.Width,
+                                ctx->Const.MinLineWidthAA,
+                                ctx->Const.MaxLineWidthAA);
+   }
+   else {
+      raster->line_width = CLAMP(ctx->Line.Width,
+                                ctx->Const.MinLineWidth,
+                                ctx->Const.MaxLineWidth);
+   }
+
+   raster->line_stipple_enable = ctx->Line.StippleFlag;
+   raster->line_stipple_pattern = ctx->Line.StipplePattern;
+   /* GL stipple factor is in [1,256], remap to [0, 255] here */
+   raster->line_stipple_factor = ctx->Line.StippleFactor - 1;
+
+   /* _NEW_MULTISAMPLE */
+   if (ctx->Multisample._Enabled || st->force_msaa)
+      raster->multisample = 1;
+
+   /* _NEW_SCISSOR */
+   if (ctx->Scissor.Enabled)
+      raster->scissor = 1;
+
+   /* _NEW_FRAG_CLAMP */
+   raster->clamp_fragment_color = ctx->Color._ClampFragmentColor;
+
+   raster->gl_rasterization_rules = 1;
+
+   cso_set_rasterizer(st->cso_context, raster);
+}
+
+const struct st_tracked_state st_update_rasterizer = {
+   "st_update_rasterizer",    /* name */
+   {
+      (_NEW_BUFFERS |
+       _NEW_LIGHT |
+       _NEW_LINE |
+       _NEW_MULTISAMPLE |
+       _NEW_POINT |
+       _NEW_POLYGON |
+       _NEW_PROGRAM |
+       _NEW_SCISSOR |
+       _NEW_FRAG_CLAMP),      /* mesa state dependencies*/
+      ST_NEW_VERTEX_PROGRAM,  /* state tracker dependencies */
+   },
+   update_raster_state     /* update function */
+};