From 878c371e6cf6eb28afacc482d8aeaa0119f00d5b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 13 Sep 2005 04:42:09 +0000 Subject: Replace ctx->Driver.StencilOp/Func/Mask() functions with ctx->Driver.Stencil*Separate() functions. --- src/mesa/drivers/dri/r200/r200_state.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/mesa/drivers/dri/r200') diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 968783607d..e31337b5b6 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1435,8 +1435,9 @@ static void r200UpdateClipPlanes( GLcontext *ctx ) * Stencil */ -static void r200StencilFunc( GLcontext *ctx, GLenum func, - GLint ref, GLuint mask ) +static void +r200StencilFuncSeparate( GLcontext *ctx, GLenum face, GLenum func, + GLint ref, GLuint mask ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); GLuint refmask = ((ctx->Stencil.Ref[0] << R200_STENCIL_REF_SHIFT) | @@ -1479,7 +1480,8 @@ static void r200StencilFunc( GLcontext *ctx, GLenum func, rmesa->hw.msk.cmd[MSK_RB3D_STENCILREFMASK] |= refmask; } -static void r200StencilMask( GLcontext *ctx, GLuint mask ) +static void +r200StencilMaskSeparate( GLcontext *ctx, GLenum face, GLuint mask ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); @@ -1489,8 +1491,9 @@ static void r200StencilMask( GLcontext *ctx, GLuint mask ) (ctx->Stencil.WriteMask[0] << R200_STENCIL_WRITEMASK_SHIFT); } -static void r200StencilOp( GLcontext *ctx, GLenum fail, - GLenum zfail, GLenum zpass ) +static void +r200StencilOpSeparate( GLcontext *ctx, GLenum face, GLenum fail, + GLenum zfail, GLenum zpass ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); @@ -2427,9 +2430,9 @@ void r200InitStateFuncs( struct dd_function_table *functions ) functions->RenderMode = r200RenderMode; functions->Scissor = r200Scissor; functions->ShadeModel = r200ShadeModel; - functions->StencilFunc = r200StencilFunc; - functions->StencilMask = r200StencilMask; - functions->StencilOp = r200StencilOp; + functions->StencilFuncSeparate = r200StencilFuncSeparate; + functions->StencilMaskSeparate = r200StencilMaskSeparate; + functions->StencilOpSeparate = r200StencilOpSeparate; functions->Viewport = r200Viewport; /* Swrast hooks for imaging extensions: -- cgit v1.2.3