Attachment 12869 Details for Bug 13368 – Patch causing the reported problem

[patch] Patch causing the reported problem

flagstobitfield.patch (text/plain), 7.70 KB, created by Hans de Goede on 2007-11-30 07:38:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2007-11-30 07:38:34 UTC

Size: 7.70 KB

patch

obsolete

>diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
>index 0e14345..1c6167b 100644
>--- a/src/mesa/main/enable.c
>+++ b/src/mesa/main/enable.c
>@@ -364,6 +364,10 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
>       case GL_LIGHTING:
>          if (ctx->Light.Enabled == state)
>             return;
>+         if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
>+            ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;
>+         else
>+            ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;
>          FLUSH_VERTICES(ctx, _NEW_LIGHT);
>          ctx->Light.Enabled = state;
>          break;
>@@ -372,12 +376,14 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
>             return;
>          FLUSH_VERTICES(ctx, _NEW_LINE);
>          ctx->Line.SmoothFlag = state;
>+         ctx->_TriangleCaps ^= DD_LINE_SMOOTH;
>          break;
>       case GL_LINE_STIPPLE:
>          if (ctx->Line.StippleFlag == state)
>             return;
>          FLUSH_VERTICES(ctx, _NEW_LINE);
>          ctx->Line.StippleFlag = state;
>+         ctx->_TriangleCaps ^= DD_LINE_STIPPLE;
>          break;
>       case GL_INDEX_LOGIC_OP:
>          if (ctx->Color.IndexLogicOpEnabled == state)
>@@ -516,18 +522,21 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
>             return;
>          FLUSH_VERTICES(ctx, _NEW_POINT);
>          ctx->Point.SmoothFlag = state;
>+         ctx->_TriangleCaps ^= DD_POINT_SMOOTH;
>          break;
>       case GL_POLYGON_SMOOTH:
>          if (ctx->Polygon.SmoothFlag == state)
>             return;
>          FLUSH_VERTICES(ctx, _NEW_POLYGON);
>          ctx->Polygon.SmoothFlag = state;
>+         ctx->_TriangleCaps ^= DD_TRI_SMOOTH;
>          break;
>       case GL_POLYGON_STIPPLE:
>          if (ctx->Polygon.StippleFlag == state)
>             return;
>          FLUSH_VERTICES(ctx, _NEW_POLYGON);
>          ctx->Polygon.StippleFlag = state;
>+         ctx->_TriangleCaps ^= DD_TRI_STIPPLE;
>          break;
>       case GL_POLYGON_OFFSET_POINT:
>          if (ctx->Polygon.OffsetPoint == state)
>@@ -877,6 +886,10 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
>             return;
>          FLUSH_VERTICES(ctx, _NEW_STENCIL);
>          ctx->Stencil.TestTwoSide = state;
>+         if (state)
>+            ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;
>+         else
>+            ctx->_TriangleCaps &= ~DD_TRI_TWOSTENCIL;
>          break;
> 
> #if FEATURE_ARB_fragment_program
>diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
>index 6e05761..6dd334e 100644
>--- a/src/mesa/main/light.c
>+++ b/src/mesa/main/light.c
>@@ -53,6 +53,11 @@ _mesa_ShadeModel( GLenum mode )
> 
>    FLUSH_VERTICES(ctx, _NEW_LIGHT);
>    ctx->Light.ShadeModel = mode;
>+   if (mode == GL_FLAT)
>+      ctx->_TriangleCaps |= DD_FLATSHADE;
>+   else
>+      ctx->_TriangleCaps &= ~DD_FLATSHADE;
>+
>    if (ctx->Driver.ShadeModel)
>       ctx->Driver.ShadeModel( ctx, mode );
> }
>@@ -441,6 +446,10 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params )
> 	    return;
> 	 FLUSH_VERTICES(ctx, _NEW_LIGHT);
> 	 ctx->Light.Model.TwoSide = newbool;
>+         if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
>+            ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE;
>+         else
>+            ctx->_TriangleCaps &= ~DD_TRI_LIGHT_TWOSIDE;
>          break;
>       case GL_LIGHT_MODEL_COLOR_CONTROL:
>          if (params[0] == (GLfloat) GL_SINGLE_COLOR)
>diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
>index dc7195d..b464c4f 100644
>--- a/src/mesa/main/lines.c
>+++ b/src/mesa/main/lines.c
>@@ -59,6 +59,11 @@ _mesa_LineWidth( GLfloat width )
> 			    ctx->Const.MinLineWidth,
> 			    ctx->Const.MaxLineWidth);
> 
>+   if (width != 1.0F)
>+      ctx->_TriangleCaps |= DD_LINE_WIDTH;
>+   else
>+      ctx->_TriangleCaps &= ~DD_LINE_WIDTH;
>+
>    if (ctx->Driver.LineWidth)
>       ctx->Driver.LineWidth(ctx, width);
> }
>diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
>index 408b68a..8825bb1 100644
>--- a/src/mesa/main/points.c
>+++ b/src/mesa/main/points.c
>@@ -123,9 +123,15 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
> 	       return;
> 	    FLUSH_VERTICES(ctx, _NEW_POINT);
>             COPY_3V(ctx->Point.Params, params);
>+
>             ctx->Point._Attenuated = (ctx->Point.Params[0] != 1.0 ||
>                                       ctx->Point.Params[1] != 0.0 ||
>                                       ctx->Point.Params[2] != 0.0);
>+
>+            if (ctx->Point._Attenuated)
>+               ctx->_TriangleCaps |= DD_POINT_ATTEN;
>+            else
>+               ctx->_TriangleCaps &= ~DD_POINT_ATTEN;
>          }
>          else {
>             _mesa_error(ctx, GL_INVALID_ENUM,
>diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
>index fd02e5a..564250b 100644
>--- a/src/mesa/main/polygon.c
>+++ b/src/mesa/main/polygon.c
>@@ -167,6 +167,11 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
>       return;
>    }
> 
>+   if (ctx->Polygon.FrontMode == GL_FILL && ctx->Polygon.BackMode == GL_FILL)
>+      ctx->_TriangleCaps &= ~DD_TRI_UNFILLED;
>+   else
>+      ctx->_TriangleCaps |= DD_TRI_UNFILLED;
>+
>    if (ctx->Driver.PolygonMode)
>       ctx->Driver.PolygonMode(ctx, face, mode);
> }
>diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
>index 96ee512..767161f 100644
>--- a/src/mesa/main/state.c
>+++ b/src/mesa/main/state.c
>@@ -821,6 +821,16 @@ _mesa_init_exec_table(struct _glapi_table *exec)
> /*@{*/
> 
> 
>+static void
>+update_separate_specular( GLcontext *ctx )
>+{
>+   if (NEED_SECONDARY_COLOR(ctx))
>+      ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
>+   else
>+      ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR;
>+}
>+
>+
> /**
>  * Update state dependent on vertex arrays.
>  */
>@@ -1045,6 +1055,26 @@ update_color(GLcontext *ctx)
> }
> 
> 
>+/*
>+ * Check polygon state and set DD_TRI_CULL_FRONT_BACK and/or DD_TRI_OFFSET
>+ * in ctx->_TriangleCaps if needed.
>+ */
>+static void
>+update_polygon( GLcontext *ctx )
>+{
>+   ctx->_TriangleCaps &= ~(DD_TRI_CULL_FRONT_BACK | DD_TRI_OFFSET);
>+
>+   if (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
>+      ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK;
>+
>+   /* Any Polygon offsets enabled? */
>+   if (ctx->Polygon.OffsetPoint ||
>+       ctx->Polygon.OffsetLine ||
>+       ctx->Polygon.OffsetFill) {
>+      ctx->_TriangleCaps |= DD_TRI_OFFSET;
>+   }
>+}
>+
> 
> /**
>  * Update the ctx->_TriangleCaps bitfield.
>@@ -1052,6 +1082,7 @@ update_color(GLcontext *ctx)
>  * This function must be called after other update_*() functions since
>  * there are dependencies on some other derived values.
>  */
>+#if 0
> static void
> update_tricaps(GLcontext *ctx, GLbitfield new_state)
> {
>@@ -1117,6 +1148,7 @@ update_tricaps(GLcontext *ctx, GLbitfield new_state)
>    if (ctx->Stencil._TestTwoSide)
>       ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;
> }
>+#endif
> 
> 
> /**
>@@ -1154,6 +1186,9 @@ _mesa_update_state_locked( GLcontext *ctx )
>    if (new_state & (_NEW_SCISSOR | _NEW_BUFFERS | _NEW_VIEWPORT))
>       _mesa_update_draw_buffer_bounds( ctx );
> 
>+   if (new_state & _NEW_POLYGON)
>+      update_polygon( ctx );
>+
>    if (new_state & _NEW_LIGHT)
>       _mesa_update_lighting( ctx );
> 
>@@ -1163,6 +1198,9 @@ _mesa_update_state_locked( GLcontext *ctx )
>    if (new_state & _IMAGE_NEW_TRANSFER_STATE)
>       _mesa_update_pixel( ctx, new_state );
> 
>+   if (new_state & _DD_NEW_SEPARATE_SPECULAR)
>+      update_separate_specular( ctx );
>+
>    if (new_state & (_NEW_ARRAY | _NEW_PROGRAM))
>       update_arrays( ctx );
> 
>@@ -1172,9 +1210,11 @@ _mesa_update_state_locked( GLcontext *ctx )
>    if (new_state & _NEW_COLOR)
>       update_color( ctx );
> 
>+#if 0
>    if (new_state & (_NEW_POINT | _NEW_LINE | _NEW_POLYGON | _NEW_LIGHT
>                     | _NEW_STENCIL | _DD_NEW_SEPARATE_SPECULAR))
>       update_tricaps( ctx, new_state );
>+#endif
> 
>    if (ctx->FragmentProgram._MaintainTexEnvProgram) {
>       if (new_state & (_NEW_TEXTURE | _DD_NEW_SEPARATE_SPECULAR | _NEW_FOG))

Actions: View | Splinter Review

Attachments on bug 13368: 12703 | 12869

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.