diff options
author | Brian Paul <[email protected]> | 2012-03-11 18:31:32 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2012-03-12 11:40:43 -0600 |
commit | e0ed951e1361e54ffd8e9c56fbcc2027c0c4bd24 (patch) | |
tree | 2d17170304448ba99f15cc962ba1574452279b26 /src/mesa/drivers/dri/r200 | |
parent | 5bb2059be714c09bd0fbc9aebd7dabf1ba3e63b6 (diff) |
radeon/r200: remove ClearDepth() and ClearStencil() driver hooks
The computed stencil.clear and depth.clear values aren't used anywhere.
Those fields have been removed too.
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/r200')
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 28 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_state_init.c | 12 |
2 files changed, 0 insertions, 40 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 5677a9e7b8f..1c32571cbc1 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -354,22 +354,6 @@ static void r200DepthFunc( struct gl_context *ctx, GLenum func ) } } -static void r200ClearDepth( struct gl_context *ctx, GLclampd d ) -{ - r200ContextPtr rmesa = R200_CONTEXT(ctx); - GLuint format = (rmesa->hw.ctx.cmd[CTX_RB3D_ZSTENCILCNTL] & - R200_DEPTH_FORMAT_MASK); - - switch ( format ) { - case R200_DEPTH_FORMAT_16BIT_INT_Z: - rmesa->radeon.state.depth.clear = d * 0x0000ffff; - break; - case R200_DEPTH_FORMAT_24BIT_INT_Z: - rmesa->radeon.state.depth.clear = d * 0x00ffffff; - break; - } -} - static void r200DepthMask( struct gl_context *ctx, GLboolean flag ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); @@ -1547,16 +1531,6 @@ r200StencilOpSeparate( struct gl_context *ctx, GLenum face, GLenum fail, } } -static void r200ClearStencil( struct gl_context *ctx, GLint s ) -{ - r200ContextPtr rmesa = R200_CONTEXT(ctx); - - rmesa->radeon.state.stencil.clear = - ((GLuint) (ctx->Stencil.Clear & 0xff) | - (0xff << R200_STENCIL_MASK_SHIFT) | - ((ctx->Stencil.WriteMask[0] & 0xff) << R200_STENCIL_WRITEMASK_SHIFT)); -} - /* ============================================================= * Window position and viewport transformation @@ -2479,8 +2453,6 @@ void r200InitStateFuncs( radeonContextPtr radeon, struct dd_function_table *func functions->BlendEquationSeparate = r200BlendEquationSeparate; functions->BlendFuncSeparate = r200BlendFuncSeparate; functions->ClearColor = r200ClearColor; - functions->ClearDepth = r200ClearDepth; - functions->ClearStencil = r200ClearStencil; 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 bddecaf2c2d..138100926cf 100644 --- a/src/mesa/drivers/dri/r200/r200_state_init.c +++ b/src/mesa/drivers/dri/r200/r200_state_init.c @@ -622,18 +622,6 @@ void r200InitState( r200ContextPtr rmesa ) rmesa->radeon.state.color.clear = 0x00000000; - switch ( ctx->Visual.depthBits ) { - case 16: - rmesa->radeon.state.depth.clear = 0x0000ffff; - rmesa->radeon.state.stencil.clear = 0x00000000; - break; - case 24: - default: - rmesa->radeon.state.depth.clear = 0x00ffffff; - rmesa->radeon.state.stencil.clear = 0xffff0000; - break; - } - rmesa->radeon.Fallback = 0; rmesa->radeon.hw.max_state_size = 0; |