r300g: remove pipe_context from r300_screen

diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index 8606c0004e5325bc4ef5dfd05dd4285850a5e677..ed24fb54ab1126ca715dfe29c26e3be6ce540114 100644 (file)
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -162,8 +162,6 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
     if (!r300)
         return NULL;
 
-    r300screen->ctx = (struct pipe_context*)r300;
-
     r300->winsys = radeon_winsys;
 
     r300->context.winsys = (struct pipe_winsys*)radeon_winsys;
@@ -212,8 +210,6 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
 
     r300_init_transfer_functions(r300);
 
-    /* r300_init_surface_functions(r300); */
-
     r300_init_state_functions(r300);
 
     r300->invariant_state.dirty = TRUE;

diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 71310b269299fad3928fd573c6732fef3679b9eb..abc1303e126339b2190aebea2d98f881afcbd615 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -38,10 +38,6 @@ struct r300_screen {
 
     struct radeon_winsys* radeon_winsys;
 
-    /* XXX This hack will be removed once texture transfers become part of
-     * pipe_context. */
-    struct pipe_context* ctx;
-
     /* Chipset capabilities */
     struct r300_capabilities* caps;