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/r300/r300_state.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/mesa/drivers/dri/r300/r300_state.c') diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index b6a03a2274..03319f74f8 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -756,8 +756,8 @@ static void r300ShadeModel(GLcontext * ctx, GLenum mode) } } -static void r300StencilFunc(GLcontext * ctx, GLenum func, - GLint ref, GLuint mask) +static void r300StencilFuncSeparate(GLcontext * ctx, GLenum face, + GLenum func, GLint ref, GLuint mask) { r300ContextPtr rmesa = R300_CONTEXT(ctx); GLuint refmask = ((ctx->Stencil.Ref[0] << R300_RB3D_ZS2_STENCIL_REF_SHIFT) | @@ -781,7 +781,7 @@ static void r300StencilFunc(GLcontext * ctx, GLenum func, rmesa->hw.zs.cmd[R300_ZS_CNTL_2] |= refmask; } -static void r300StencilMask(GLcontext * ctx, GLuint mask) +static void r300StencilMaskSeparate(GLcontext * ctx, GLenum face, GLuint mask) { r300ContextPtr rmesa = R300_CONTEXT(ctx); @@ -791,8 +791,8 @@ static void r300StencilMask(GLcontext * ctx, GLuint mask) } -static void r300StencilOp(GLcontext * ctx, GLenum fail, - GLenum zfail, GLenum zpass) +static void r300StencilOpSeparate(GLcontext * ctx, GLenum face, GLenum fail, + GLenum zfail, GLenum zpass) { r300ContextPtr rmesa = R300_CONTEXT(ctx); @@ -2303,9 +2303,9 @@ void r300InitStateFuncs(struct dd_function_table* functions) /* Stencil related */ functions->ClearStencil = r300ClearStencil; - functions->StencilFunc = r300StencilFunc; - functions->StencilMask = r300StencilMask; - functions->StencilOp = r300StencilOp; + functions->StencilFuncSeparate = r300StencilFuncSeparate; + functions->StencilMaskSeparate = r300StencilMaskSeparate; + functions->StencilOpSeparate = r300StencilOpSeparate; /* Viewport related */ functions->Viewport = r300Viewport; -- cgit v1.2.3