From b32fb8ac9e05b78d2bd07fcaf0d5f68525c4aa3b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 16 Apr 2013 19:06:22 -0600 Subject: mesa: remove DD_TRI_STIPPLE flag Make it a local macro for the i915 driver. v2: use conditional operator instead of bit shifting Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i915/intel_tris.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index 1c7fa886741..e62fd612aae 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -944,6 +944,7 @@ intelFastRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint +#define DD_TRI_STIPPLE (1 << 4) #define DD_TRI_OFFSET (1 << 5) #define DD_LINE_STIPPLE (1 << 7) #define DD_POINT_ATTEN (1 << 9) @@ -957,6 +958,7 @@ intelChooseRenderState(struct gl_context * ctx) TNLcontext *tnl = TNL_CONTEXT(ctx); struct intel_context *intel = intel_context(ctx); GLuint flags = ctx->_TriangleCaps | + (ctx->Polygon.StippleFlag ? DD_TRI_STIPPLE : 0) | ((ctx->Polygon.OffsetPoint || ctx->Polygon.OffsetLine || ctx->Polygon.OffsetFill) ? DD_TRI_OFFSET : 0) | -- cgit v1.2.3