summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/mach64/mach64_context.c5
-rw-r--r--src/mesa/drivers/dri/mach64/mach64_context.h1
-rw-r--r--src/mesa/drivers/dri/mach64/mach64_screen.c9
-rw-r--r--src/mesa/drivers/dri/mach64/mach64_tris.c2
4 files changed, 11 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c
index 8f508fa911..524046ce43 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.c
+++ b/src/mesa/drivers/dri/mach64/mach64_context.c
@@ -230,6 +230,11 @@ GLboolean mach64CreateContext( const __GLcontextModes *glVisual,
driContextPriv->driverPrivate = (void *)mmesa;
+ if (driQueryOptionb(&mmesa->optionCache, "no_rast")) {
+ fprintf(stderr, "disabling 3D acceleration\n");
+ FALLBACK(mmesa, MACH64_FALLBACK_DISABLE, 1);
+ }
+
return GL_TRUE;
}
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h
index d82fca5aa8..4145d6b311 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.h
+++ b/src/mesa/drivers/dri/mach64/mach64_context.h
@@ -84,6 +84,7 @@ typedef struct mach64_context *mach64ContextPtr;
#define MACH64_FALLBACK_SEP_SPECULAR 0x0080
#define MACH64_FALLBACK_BLEND_EQ 0x0100
#define MACH64_FALLBACK_BLEND_FUNC 0x0200
+#define MACH64_FALLBACK_DISABLE 0x0400
#define CARD32 GLuint /* KW: For building in mesa tree */
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c
index 471ae1648e..d524a050e6 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.c
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.c
@@ -54,16 +54,17 @@ DRI_CONF_BEGIN
DRI_CONF_SECTION_PERFORMANCE
DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
DRI_CONF_SECTION_END
-#if ENABLE_PERF_BOXES
DRI_CONF_SECTION_DEBUG
+ DRI_CONF_NO_RAST(false)
+#if ENABLE_PERF_BOXES
DRI_CONF_PERFORMANCE_BOXES(false)
- DRI_CONF_SECTION_END
#endif
+ DRI_CONF_SECTION_END
DRI_CONF_END;
#if ENABLE_PERF_BOXES
-static const GLuint __driNConfigOptions = 2;
+static const GLuint __driNConfigOptions = 3;
#else
-static const GLuint __driNConfigOptions = 1;
+static const GLuint __driNConfigOptions = 2;
#endif
#ifdef USE_NEW_INTERFACE
diff --git a/src/mesa/drivers/dri/mach64/mach64_tris.c b/src/mesa/drivers/dri/mach64/mach64_tris.c
index 6b12ee92e2..5553d02ac9 100644
--- a/src/mesa/drivers/dri/mach64/mach64_tris.c
+++ b/src/mesa/drivers/dri/mach64/mach64_tris.c
@@ -1890,6 +1890,4 @@ void mach64InitTriFuncs( GLcontext *ctx )
tnl->Driver.Render.PrimitiveNotify = mach64RenderPrimitive;
tnl->Driver.Render.ResetLineStipple = _swrast_ResetLineStipple;
tnl->Driver.Render.BuildVertices = mach64BuildVertices;
-
-/* mach64Fallback( ctx, 0x100000, 1 ); */
}