From c90ae6b501a4a72d33869e1be241e87264747735 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 11 Mar 2012 18:31:32 -0600 Subject: [PATCH] radeon/r200: remove ClearColor driver functions The state.color.clear value was never used anywhere. Reviewed-by: Dave Airlie --- src/mesa/drivers/dri/r200/r200_state.c | 18 ------------------ src/mesa/drivers/dri/r200/r200_state_init.c | 2 -- src/mesa/drivers/dri/radeon/radeon_common_context.h | 1 - src/mesa/drivers/dri/radeon/radeon_state.c | 18 ------------------ src/mesa/drivers/dri/radeon/radeon_state_init.c | 2 -- 5 files changed, 41 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 1c32571..3131007 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1676,23 +1676,6 @@ void r200UpdateViewportOffset( struct gl_context *ctx ) * Miscellaneous */ -static void r200ClearColor( struct gl_context *ctx, - const union gl_color_union c ) -{ - r200ContextPtr rmesa = R200_CONTEXT(ctx); - GLubyte color[4]; - struct radeon_renderbuffer *rrb; - - rrb = radeon_get_colorbuffer(&rmesa->radeon); - if (!rrb) - return; - _mesa_unclamped_float_rgba_to_ubyte(color, c.f); - rmesa->radeon.state.color.clear = radeonPackColor( rrb->cpp, - color[0], color[1], - color[2], color[3] ); -} - - static void r200RenderMode( struct gl_context *ctx, GLenum mode ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); @@ -2452,7 +2435,6 @@ void r200InitStateFuncs( radeonContextPtr radeon, struct dd_function_table *func functions->BlendColor = r200BlendColor; functions->BlendEquationSeparate = r200BlendEquationSeparate; functions->BlendFuncSeparate = r200BlendFuncSeparate; - functions->ClearColor = r200ClearColor; functions->ClipPlane = r200ClipPlane; functions->ColorMask = r200ColorMask; functions->CullFace = r200CullFace; diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c index 1381009..2fe3f94 100644 --- a/src/mesa/drivers/dri/r200/r200_state_init.c +++ b/src/mesa/drivers/dri/r200/r200_state_init.c @@ -620,8 +620,6 @@ void r200InitState( r200ContextPtr rmesa ) struct gl_context *ctx = rmesa->radeon.glCtx; GLuint i; - rmesa->radeon.state.color.clear = 0x00000000; - rmesa->radeon.Fallback = 0; rmesa->radeon.hw.max_state_size = 0; diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h index fdffb1e..11275f8b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.h +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h @@ -110,7 +110,6 @@ struct radeon_framebuffer struct radeon_colorbuffer_state { - GLuint clear; int roundEnable; struct gl_renderbuffer *rb; uint32_t draw_offset; /* offset into color renderbuffer - FBOs */ diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index dcec813..a3b4e54 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -1458,23 +1458,6 @@ void radeonUpdateViewportOffset( struct gl_context *ctx ) * Miscellaneous */ -static void radeonClearColor( struct gl_context *ctx, - const union gl_color_union color ) -{ - r100ContextPtr rmesa = R100_CONTEXT(ctx); - GLubyte c[4]; - struct radeon_renderbuffer *rrb; - - rrb = radeon_get_colorbuffer(&rmesa->radeon); - if (!rrb) - return; - - _mesa_unclamped_float_rgba_to_ubyte(c, color.f); - rmesa->radeon.state.color.clear = radeonPackColor( rrb->cpp, - c[0], c[1], c[2], c[3] ); -} - - static void radeonRenderMode( struct gl_context *ctx, GLenum mode ) { r100ContextPtr rmesa = R100_CONTEXT(ctx); @@ -2208,7 +2191,6 @@ void radeonInitStateFuncs( struct gl_context *ctx ) ctx->Driver.AlphaFunc = radeonAlphaFunc; ctx->Driver.BlendEquationSeparate = radeonBlendEquationSeparate; ctx->Driver.BlendFuncSeparate = radeonBlendFuncSeparate; - ctx->Driver.ClearColor = radeonClearColor; ctx->Driver.ClipPlane = radeonClipPlane; ctx->Driver.ColorMask = radeonColorMask; ctx->Driver.CullFace = radeonCullFace; diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c index 1f445b2..1a7d262 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state_init.c +++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c @@ -506,8 +506,6 @@ void radeonInitState( r100ContextPtr rmesa ) struct gl_context *ctx = rmesa->radeon.glCtx; GLuint i; - rmesa->radeon.state.color.clear = 0x00000000; - rmesa->radeon.Fallback = 0; -- 2.7.4