st/mesa: more fixes for stencil ref change.

compiles. Might need to do something to make it possible to save/restore
stencil ref.

2 files changed, 20 insertions, 2 deletions

diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index 4395c682093..3c07afba9aa 100644
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -123,7 +123,6 @@ update_depth_stencil_alpha(struct st_context *st)
          dsa->stencil[1].fail_op = gl_stencil_op_to_pipe(ctx->Stencil.FailFunc[back]);
          dsa->stencil[1].zfail_op = gl_stencil_op_to_pipe(ctx->Stencil.ZFailFunc[back]);
          dsa->stencil[1].zpass_op = gl_stencil_op_to_pipe(ctx->Stencil.ZPassFunc[back]);
-         dsa->stencil[1].ref_value = ctx->Stencil.Ref[back] & 0xff;
          dsa->stencil[1].valuemask = ctx->Stencil.ValueMask[back] & 0xff;
          dsa->stencil[1].writemask = ctx->Stencil.WriteMask[back] & 0xff;
          sr.ref_value[1] = ctx->Stencil.Ref[back] & 0xff;
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 0c7bcb85973..ed92e3928e3 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -192,6 +192,7 @@ clear_with_quad(GLcontext *ctx,
                 GLboolean color, GLboolean depth, GLboolean stencil)
 {
    struct st_context *st = ctx->st;
+   struct pipe_stencil_ref stencil_ref;
    const GLfloat x0 = (GLfloat) ctx->DrawBuffer->_Xmin;
    const GLfloat x1 = (GLfloat) ctx->DrawBuffer->_Xmax;
    GLfloat y0, y1;
@@ -247,6 +248,7 @@ clear_with_quad(GLcontext *ctx,
    {
       struct pipe_depth_stencil_alpha_state depth_stencil;
       memset(&depth_stencil, 0, sizeof(depth_stencil));
+      memset(&stencil_ref, 0, sizeof(stencil_ref));
       if (depth) {
          depth_stencil.depth.enabled = 1;
          depth_stencil.depth.writemask = 1;
@@ -259,9 +261,10 @@ clear_with_quad(GLcontext *ctx,
          depth_stencil.stencil[0].fail_op = PIPE_STENCIL_OP_REPLACE;
          depth_stencil.stencil[0].zpass_op = PIPE_STENCIL_OP_REPLACE;
          depth_stencil.stencil[0].zfail_op = PIPE_STENCIL_OP_REPLACE;
-         depth_stencil.stencil[0].ref_value = ctx->Stencil.Clear;
          depth_stencil.stencil[0].valuemask = 0xff;
          depth_stencil.stencil[0].writemask = ctx->Stencil.WriteMask[0] & 0xff;
+         stencil_ref.ref_value[0] = ctx->Stencil.Clear;
+         cso_set_stencil_ref(st->cso_context, &stencil_ref);
       }
 
       cso_set_depth_stencil_alpha(st->cso_context, &depth_stencil);
@@ -281,6 +284,22 @@ clear_with_quad(GLcontext *ctx,
    cso_restore_rasterizer(st->cso_context);
    cso_restore_fragment_shader(st->cso_context);
    cso_restore_vertex_shader(st->cso_context);
+
+   /* cannot restore stencil ref. Try to reconstruct? */
+   if (stencil) {
+      if (ctx->Stencil.Enabled && ctx->DrawBuffer->Visual.stencilBits > 0) {
+         stencil_ref.ref_value[0] = ctx->Stencil.Ref[0] & 0xff;
+         if (ctx->Stencil._TestTwoSide) {
+            const GLuint back = ctx->Stencil._BackFace;
+            stencil_ref.ref_value[1] = ctx->Stencil.Ref[back] & 0xff;
+         }
+         else {
+            stencil_ref.ref_value[1] = stencil_ref.ref_value[0];
+         }
+      }
+      cso_set_stencil_ref(st->cso_context, &stencil_ref);
+   }
+
 }