r300: Removed some deprecated code from r300_context.c and corrected an unused

variable warning in r300_render.c.

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 265b8defd84b68c29e458678cac1132153d507b8..21750aab33c7b501f479353dc116f5cc42b3b3c4 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -355,12 +355,6 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
        radeon_init_vtxfmt_a(r300);
 #endif
 
-#if 0
-       /* plug in a few more device driver functions */
-       /* XXX these should really go right after _mesa_init_driver_functions() */
-       r300InitPixelFuncs(ctx);
-       r300InitSwtcl(ctx);
-#endif
        TNL_CONTEXT(ctx)->Driver.RunPipeline = _tnl_run_pipeline;
 
        tcl_mode = driQueryOptioni(&r300->radeon.optionCache, "tcl_mode");

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 0e585855e999ec2816e7c2a88634770767dd06e2..be10a185875f57faa3db40f03ad13a834d91c215 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -196,7 +196,6 @@ static void inline r300FireEB(r300ContextPtr rmesa, unsigned long addr,
        drm_radeon_cmd_header_t *cmd = NULL;
        unsigned long t_addr;
        unsigned long magic_1, magic_2;
-       GLcontext *ctx = rmesa->radeon.glCtx;
 
        assert(elt_size == 2 || elt_size == 4);