Commit df0f6a0a authored by Marek Olšák's avatar Marek Olšák

mesa: don't flag _NEW_POLYGON_STIPPLE for st/mesa

Reviewed-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Brian Paul's avatarBrian Paul <brianp@vmware.com>
Reviewed-by: Timothy Arceri's avatarTimothy Arceri <tarceri@itsqueeze.com>
parent 58a02196
......@@ -1287,7 +1287,12 @@ _mesa_PopAttrib(void)
break;
case GL_POLYGON_STIPPLE_BIT:
memcpy( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
ctx->NewState |= _NEW_POLYGONSTIPPLE;
if (ctx->DriverFlags.NewPolygonStipple)
ctx->NewDriverState |= ctx->DriverFlags.NewPolygonStipple;
else
ctx->NewState |= _NEW_POLYGONSTIPPLE;
if (ctx->Driver.PolygonStipple)
ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );
break;
......
......@@ -4526,6 +4526,9 @@ struct gl_driver_flags
/** gl_context::Polygon */
uint64_t NewPolygonState;
/** gl_context::PolygonStipple */
uint64_t NewPolygonStipple;
/** gl_context::ViewportArray */
uint64_t NewViewport;
};
......
......@@ -199,7 +199,9 @@ _mesa_PolygonStipple(const GLubyte *pattern)
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glPolygonStipple\n");
FLUSH_VERTICES(ctx, _NEW_POLYGONSTIPPLE);
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewPolygonStipple ? 0 :
_NEW_POLYGONSTIPPLE);
ctx->NewDriverState |= ctx->DriverFlags.NewPolygonStipple;
pattern = _mesa_map_validate_pbo_source(ctx, 2,
&ctx->Unpack, 32, 32, 1,
......
......@@ -199,9 +199,6 @@ st_invalidate_state(struct gl_context * ctx)
if (new_state & _NEW_FOG)
st->dirty |= ST_NEW_FS_STATE;
if (new_state & _NEW_POLYGONSTIPPLE)
st->dirty |= ST_NEW_POLY_STIPPLE;
if (new_state & _NEW_FRAG_CLAMP) {
if (st->clamp_frag_color_in_shader)
st->dirty |= ST_NEW_FS_STATE;
......@@ -524,6 +521,7 @@ static void st_init_driver_flags(struct st_context *st)
f->NewDepthClamp = ST_NEW_RASTERIZER;
f->NewLineState = ST_NEW_RASTERIZER;
f->NewPolygonState = ST_NEW_RASTERIZER;
f->NewPolygonStipple = ST_NEW_POLY_STIPPLE;
f->NewViewport = ST_NEW_VIEWPORT;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment