fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-26 14:20:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300: Removed the dangerous R300_SPAN_DISABLE_LOCKING flag.

Browse source 
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.
This commit is contained in:
Oliver McFadden 2007-05-09 19:24:59 +00:00
parent df747eb354
commit 56c2f7bb42
2 changed files with 6 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -871,7 +871,6 @@ struct r300_context {
#endif
GLboolean texmicrotile;
GLboolean span_dlocking;
GLboolean disable_lowimpact_fallback;
};

34
src/mesa/drivers/dri/r300/radeon_span.c
View file

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