summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2007-05-08 19:46:25 +0000
committerOliver McFadden <[email protected]>2007-05-08 19:46:25 +0000
commitd132f7245deabc8bdb7effafcb489df4cee59f2e (patch)
tree268fc598ee740498d45cde2d97eaffce43e23a54
parent73bc8b63ac2206a1c1dfd02891493db6e747a36f (diff)
r300: Removed some deprecated code from r300_context.c and corrected an unused
variable warning in r300_render.c.
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.c6
-rw-r--r--src/mesa/drivers/dri/r300/r300_render.c1
2 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 265b8defd84..21750aab33c 100644
--- 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 0e585855e99..be10a185875 100644
--- 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);