diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_tris.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 32 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 6 |
3 files changed, 6 insertions, 44 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index a36011a2769..c802d7231d0 100644 --- a/src/mesa/drivers/dri/i915/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c @@ -944,7 +944,7 @@ intelFastRenderClippedPoly(struct gl_context * ctx, const GLuint * elts, GLuint -#define ANY_FALLBACK_FLAGS (DD_LINE_STIPPLE | DD_TRI_STIPPLE | DD_POINT_ATTEN | DD_POINT_SMOOTH | DD_TRI_SMOOTH) +#define ANY_FALLBACK_FLAGS (DD_LINE_STIPPLE | DD_TRI_STIPPLE | DD_POINT_ATTEN) #define ANY_RASTER_FLAGS (DD_TRI_LIGHT_TWOSIDE | DD_TRI_OFFSET | DD_TRI_UNFILLED) void @@ -995,11 +995,6 @@ intelChooseRenderState(struct gl_context * ctx) if ((flags & DD_TRI_STIPPLE) && !intel->hw_stipple) intel->draw_tri = intel_fallback_tri; - if (flags & DD_TRI_SMOOTH) { - if (intel->conformance_mode > 0) - intel->draw_tri = intel_fallback_tri; - } - if (flags & DD_POINT_ATTEN) { if (0) intel->draw_point = intel_atten_point; @@ -1007,11 +1002,6 @@ intelChooseRenderState(struct gl_context * ctx) intel->draw_point = intel_fallback_point; } - if (flags & DD_POINT_SMOOTH) { - if (intel->conformance_mode > 0) - intel->draw_point = intel_fallback_point; - } - index |= INTEL_FALLBACK_BIT; } } diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 7b2bdadc9de..5432fb1f600 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -652,33 +652,11 @@ intelInitContext(struct intel_context *intel, break; } - /* This doesn't yet catch all non-conformant rendering, but it's a - * start. - */ - if (getenv("INTEL_STRICT_CONFORMANCE")) { - unsigned int value = atoi(getenv("INTEL_STRICT_CONFORMANCE")); - if (value > 0) { - intel->conformance_mode = value; - } - else { - intel->conformance_mode = 1; - } - } - - if (intel->conformance_mode > 0) { - ctx->Const.MinLineWidth = 1.0; - ctx->Const.MinLineWidthAA = 1.0; - ctx->Const.MaxLineWidth = 1.0; - ctx->Const.MaxLineWidthAA = 1.0; - ctx->Const.LineWidthGranularity = 1.0; - } - else { - ctx->Const.MinLineWidth = 1.0; - ctx->Const.MinLineWidthAA = 1.0; - ctx->Const.MaxLineWidth = 5.0; - ctx->Const.MaxLineWidthAA = 5.0; - ctx->Const.LineWidthGranularity = 0.5; - } + ctx->Const.MinLineWidth = 1.0; + ctx->Const.MinLineWidthAA = 1.0; + ctx->Const.MaxLineWidth = 5.0; + ctx->Const.MaxLineWidthAA = 5.0; + ctx->Const.LineWidthGranularity = 0.5; ctx->Const.MinPointSize = 1.0; ctx->Const.MinPointSizeAA = 1.0; diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index ef024b10e96..041a4fcd4e9 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -289,12 +289,6 @@ struct intel_context bool always_flush_batch; bool always_flush_cache; - /* 0 - nonconformant, best performance; - * 1 - fallback to sw for known conformance bugs - * 2 - always fallback to sw - */ - GLuint conformance_mode; - /* State for intelvb.c and inteltris.c. */ GLuint RenderIndex; |