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

[mesa.git] / src / mesa / drivers / dri / i830 / i830_state.c

diff --git a/src/mesa/drivers/dri/i830/i830_state.c b/src/mesa/drivers/dri/i830/i830_state.c
index 28ec9472412cd955dac4a16deb6889d4b388e353..13e25596629fa0bb6f3bd10b1eaed471de39571d 100644 (file)
--- a/src/mesa/drivers/dri/i830/i830_state.c
+++ b/src/mesa/drivers/dri/i830/i830_state.c
@@ -81,8 +81,9 @@ static __inline__ GLuint i830PackColor(GLuint format,
    }
 }
 
-static void i830StencilFunc(GLcontext *ctx, GLenum func, GLint ref,
-                           GLuint mask)
+static void
+i830StencilFuncSeparate(GLcontext *ctx, GLenum face, GLenum func, GLint ref,
+                        GLuint mask)
 {
    i830ContextPtr imesa = I830_CONTEXT(ctx);
    int test = 0;
@@ -134,7 +135,8 @@ static void i830StencilFunc(GLcontext *ctx, GLenum func, GLint ref,
                                            STENCIL_TEST_FUNC(test));
 }
 
-static void i830StencilMask(GLcontext *ctx, GLuint mask)
+static void
+i830StencilMaskSeparate(GLcontext *ctx, GLenum face, GLuint mask)
 {
    i830ContextPtr imesa = I830_CONTEXT(ctx);
 
@@ -149,8 +151,9 @@ static void i830StencilMask(GLcontext *ctx, GLuint mask)
                                        STENCIL_WRITE_MASK(mask));
 }
 
-static void i830StencilOp(GLcontext *ctx, GLenum fail, GLenum zfail,
-                         GLenum zpass)
+static void
+i830StencilOpSeparate(GLcontext *ctx, GLenum face, GLenum fail, GLenum zfail,
+                      GLenum zpass)
 {
    i830ContextPtr imesa = I830_CONTEXT(ctx);
    int fop, dfop, dpop;
@@ -1681,9 +1684,9 @@ void i830DDInitStateFuncs(GLcontext *ctx)
    ctx->Driver.Viewport = i830Viewport;
    ctx->Driver.LightModelfv = i830LightModelfv;
 
-   ctx->Driver.StencilFunc = i830StencilFunc;
-   ctx->Driver.StencilMask = i830StencilMask;
-   ctx->Driver.StencilOp = i830StencilOp;
+   ctx->Driver.StencilFuncSeparate = i830StencilFuncSeparate;
+   ctx->Driver.StencilMaskSeparate = i830StencilMaskSeparate;
+   ctx->Driver.StencilOpSeparate = i830StencilOpSeparate;
 
    /* Pixel path fallbacks.
     */