Module: Mesa Branch: master Commit: e7f2f2dea5acdbd1a12ed88914e64a38a97432f0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e7f2f2dea5acdbd1a12ed88914e64a38a97432f0
Author: Emil Velikov <[email protected]> Date: Wed Aug 20 20:52:07 2014 +0100 dri/radeon: nuke the remaining references to sarea Remainder of the dri1 times. Cc: Marek Olšák <[email protected]> Cc: Michel Dänzer <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Michel Dänzer <[email protected]> --- src/mesa/drivers/dri/r200/r200_ioctl.c | 7 ------- src/mesa/drivers/dri/radeon/radeon_common_context.h | 1 - src/mesa/drivers/dri/radeon/radeon_screen.h | 3 --- 3 files changed, 11 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c index ef0d637..515be92 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c @@ -62,13 +62,6 @@ static void r200Clear( struct gl_context *ctx, GLbitfield mask ) BUFFER_BIT_DEPTH | BUFFER_BIT_STENCIL | BUFFER_BIT_COLOR0; - if ( R200_DEBUG & RADEON_IOCTL ) { - if (rmesa->radeon.sarea) - fprintf( stderr, "r200Clear %x %d\n", mask, rmesa->radeon.sarea->pfCurrentPage); - else - fprintf( stderr, "r200Clear %x radeon->sarea is NULL\n", mask); - } - radeonFlush( ctx ); hwmask = mask & hwbits; diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h index 8330b17..cfed408 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.h +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h @@ -406,7 +406,6 @@ struct radeon_context { /* Drawable information */ unsigned int lastStamp; - drm_radeon_sarea_t *sarea; /* Private SAREA data */ /* Mirrors of some DRI state */ struct radeon_dri_mirror dri; diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h index b5cc075..b3e9267 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.h +++ b/src/mesa/drivers/dri/radeon/radeon_screen.h @@ -45,7 +45,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dri_util.h" #include "radeon_chipset.h" #include "radeon_reg.h" -#include "drm_sarea.h" #include "xmlconfig.h" @@ -88,7 +87,6 @@ typedef struct radeon_screen { __volatile__ uint32_t *scratch; __DRIscreen *driScreen; - unsigned int sarea_priv_offset; unsigned int gart_buffer_offset; /* offset in card memory space */ unsigned int gart_texture_offset; /* offset in card memory space */ unsigned int gart_base; @@ -100,7 +98,6 @@ typedef struct radeon_screen { int num_gb_pipes; int num_z_pipes; - drm_radeon_sarea_t *sarea; /* Private SAREA data */ struct radeon_bo_manager *bom; } radeonScreenRec, *radeonScreenPtr; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
