summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-05-09 19:24:59 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-05-09 19:24:59 +0000
commit56c2f7bb42eaeb443e2e273383d1d5974fc89e03 (patch)
treef72bf3adde317de5474633eca82b3ec35ecf8489 /src/mesa/drivers/dri
parentdf747eb354ca71227c9aa8aa10753be11203ca23 (diff)
r300: Removed the dangerous R300_SPAN_DISABLE_LOCKING flag.
Enabling R300_SPAN_DISABLE_LOCKING would probably cause more lockups; I think there are a couple of other little bugs in this code, too. It's best to remove it.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.h1
-rw-r--r--src/mesa/drivers/dri/r300/radeon_span.c34
2 files changed, 6 insertions, 29 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 9f36c4238c..8dc8f98199 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -871,7 +871,6 @@ struct r300_context {
#endif
GLboolean texmicrotile;
- GLboolean span_dlocking;
GLboolean disable_lowimpact_fallback;
};
diff --git a/src/mesa/drivers/dri/r300/radeon_span.c b/src/mesa/drivers/dri/r300/radeon_span.c
index 5e85733ae6..5003f7cbc8 100644
--- a/src/mesa/drivers/dri/r300/radeon_span.c
+++ b/src/mesa/drivers/dri/r300/radeon_span.c
@@ -233,32 +233,12 @@ do { \
static void radeonSpanRenderStart(GLcontext * ctx)
{
radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
-
- static int first = 1;
+#if COMPILE_R300
r300ContextPtr r300 = (r300ContextPtr) rmesa;
-
- if (first) {
- r300->span_dlocking =
- getenv("R300_SPAN_DISABLE_LOCKING") ? 1 : 0;
- if (r300->span_dlocking == 0) {
- fprintf(stderr,
- "Try R300_SPAN_DISABLE_LOCKING env var if this hangs.\n");
- fflush(stderr);
- }
- first = 0;
- }
-
- if (r300->span_dlocking) {
- r300Flush(ctx);
- LOCK_HARDWARE(rmesa);
- radeonWaitForIdleLocked(rmesa);
- UNLOCK_HARDWARE(rmesa);
-
- return;
- }
- // R300_FIREVERTICES( rmesa );
- // old code has flush
- r300Flush(ctx);
+ R300_FIREVERTICES(r300);
+#else
+ RADEON_FIREVERTICES(rmesa);
+#endif
LOCK_HARDWARE(rmesa);
radeonWaitForIdleLocked(rmesa);
}
@@ -266,10 +246,8 @@ static void radeonSpanRenderStart(GLcontext * ctx)
static void radeonSpanRenderFinish(GLcontext * ctx)
{
radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
- r300ContextPtr r300 = (r300ContextPtr) rmesa;
_swrast_flush(ctx);
- if (r300->span_dlocking == 0)
- UNLOCK_HARDWARE(rmesa);
+ UNLOCK_HARDWARE(rmesa);
}
void radeonInitSpanFuncs(GLcontext * ctx)