diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-13 04:42:09 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-13 04:42:09 +0000 |
| commit | 878c371e6cf6eb28afacc482d8aeaa0119f00d5b (patch) | |
| tree | 61c5d8f5e55e426e51a8601566e2a6a71ebf7415 /src/mesa/drivers/dri/r200 | |
| parent | 42c34efd23d7ad05df9f3c71f7d52dd259e179d8 (diff) | |
Replace ctx->Driver.StencilOp/Func/Mask() functions with
ctx->Driver.Stencil*Separate() functions.
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 19 |
1 files changed, 11 insertions, 8 deletions
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: |