fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel: Drop the INTEL_STRICT_CONFORMANCE environment variable.

Browse source 
If you want to test the graphics driver, you want to test it under the
conditions that users will see, not some set of additional fallbacks.
If you want to test swrast, run the swrast driver (or no_rast=true)
instead.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-03-05 15:24:17 -08:00
parent cdcfd5d1d6
commit 67d3ff760a
3 changed files with 6 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/drivers/dri/i915/intel_tris.c
View file

@ -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;
}
}

32
src/mesa/drivers/dri/intel/intel_context.c
View file

@ -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;

6
src/mesa/drivers/dri/intel/intel_context.h
View file

@ -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;