Replace ctx->Driver.StencilOp/Func/Mask() functions with

ctx->Driver.Stencil*Separate() functions.

1 files changed, 14 insertions, 11 deletions

diff --git a/src/mesa/drivers/dri/savage/savagestate.c b/src/mesa/drivers/dri/savage/savagestate.c
index 4affe8799b9..c3c04d587eb 100644
--- a/src/mesa/drivers/dri/savage/savagestate.c
+++ b/src/mesa/drivers/dri/savage/savagestate.c
@@ -992,8 +992,9 @@ static void savageDDFogfv(GLcontext *ctx, GLenum pname, const GLfloat *param)
 }
 
 
-static void savageDDStencilFunc(GLcontext *ctx, GLenum func, GLint ref,
-                                GLuint mask)
+static void
+savageDDStencilFuncSeparate(GLcontext *ctx, GLenum face, GLenum func,
+                            GLint ref, GLuint mask)
 {
     savageContextPtr imesa = SAVAGE_CONTEXT(ctx);
     unsigned a=0;
@@ -1024,7 +1025,8 @@ static void savageDDStencilFunc(GLcontext *ctx, GLenum func, GLint ref,
 	imesa->dirty |= SAVAGE_UPLOAD_GLOBAL;
 }
 
-static void savageDDStencilMask(GLcontext *ctx, GLuint mask)
+static void
+savageDDStencilMaskSeparate(GLcontext *ctx, GLenum face, GLuint mask)
 {
     savageContextPtr imesa = SAVAGE_CONTEXT(ctx);
 
@@ -1052,8 +1054,9 @@ static unsigned get_stencil_op_value( GLenum op )
     return STENCIL_Keep;
 }
 
-static void savageDDStencilOp(GLcontext *ctx, GLenum fail, GLenum zfail,
-                              GLenum zpass)
+static void
+savageDDStencilOpSeparate(GLcontext *ctx, GLenum face, GLenum fail,
+                          GLenum zfail, GLenum zpass)
 {
     savageContextPtr imesa = SAVAGE_CONTEXT(ctx);
     const u_int32_t stencilCtrl = imesa->regs.s4.stencilCtrl.ui;
@@ -1732,9 +1735,9 @@ void savageDDInitStateFuncs(GLcontext *ctx)
 	ctx->Driver.ColorMask = savageDDColorMask_s4;
 	ctx->Driver.ShadeModel = savageDDShadeModel_s4;
 	ctx->Driver.LightModelfv = savageDDLightModelfv_s4;
-	ctx->Driver.StencilFunc = savageDDStencilFunc;
-	ctx->Driver.StencilMask = savageDDStencilMask;
-	ctx->Driver.StencilOp = savageDDStencilOp;
+	ctx->Driver.StencilFuncSeparate = savageDDStencilFuncSeparate;
+	ctx->Driver.StencilMaskSeparate = savageDDStencilMaskSeparate;
+	ctx->Driver.StencilOpSeparate = savageDDStencilOpSeparate;
     } else {
 	ctx->Driver.Enable = savageDDEnable_s3d;
 	ctx->Driver.AlphaFunc = savageDDAlphaFunc_s3d;
@@ -1744,9 +1747,9 @@ void savageDDInitStateFuncs(GLcontext *ctx)
 	ctx->Driver.ColorMask = savageDDColorMask_s3d;
 	ctx->Driver.ShadeModel = savageDDShadeModel_s3d;
 	ctx->Driver.LightModelfv = savageDDLightModelfv_s3d;
-	ctx->Driver.StencilFunc = 0;
-	ctx->Driver.StencilMask = 0;
-	ctx->Driver.StencilOp = 0;
+	ctx->Driver.StencilFuncSeparate = NULL;
+	ctx->Driver.StencilMaskSeparate = NULL;
+	ctx->Driver.StencilOpSeparate = NULL;
     }
 
    /* Swrast hooks for imaging extensions: