From 6e4b05637fa08020a9142b2391166d2c62b54896 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 14 Mar 2010 14:32:50 +0100 Subject: r300g: remove pipe_context from r300_screen --- src/gallium/drivers/r300/r300_context.c | 4 ---- src/gallium/drivers/r300/r300_screen.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index 8606c0004e..ed24fb54ab 100644 --- 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 71310b2692..abc1303e12 100644 --- 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; -- cgit v1.2.3