gallium: it's a reference value, not a reference number

[mesa.git] / src / mesa / state_tracker / st_atom_depth.c

diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index e785434cecfeef03394b4d68c3a1fbec8925e597..2d617bd95dcae756cf82b2ed883af3fb8680ed69 100644 (file)
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -34,10 +34,10 @@
  
 
 #include "st_context.h"
-#include "st_cache.h"
 #include "st_atom.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
+#include "cso_cache/cso_context.h"
 
 
 /**
@@ -91,56 +91,61 @@ gl_stencil_op_to_pipe(GLenum func)
 }
 
 static void
-update_depth_stencil(struct st_context *st)
+update_depth_stencil_alpha(struct st_context *st)
 {
-   struct pipe_depth_stencil_state depth_stencil;
-   const struct cso_depth_stencil *cso;
+   struct pipe_depth_stencil_alpha_state *dsa = &st->state.depth_stencil;
 
-   memset(&depth_stencil, 0, sizeof(depth_stencil));
+   memset(dsa, 0, sizeof(*dsa));
 
-   depth_stencil.depth.enabled = st->ctx->Depth.Test;
-   depth_stencil.depth.writemask = st->ctx->Depth.Mask;
-   depth_stencil.depth.func = st_compare_func_to_pipe(st->ctx->Depth.Func);
+   dsa->depth.enabled = st->ctx->Depth.Test;
+   dsa->depth.writemask = st->ctx->Depth.Mask;
+   dsa->depth.func = st_compare_func_to_pipe(st->ctx->Depth.Func);
 
    if (st->ctx->Query.CurrentOcclusionObject &&
        st->ctx->Query.CurrentOcclusionObject->Active)
-      depth_stencil.depth.occlusion_count = 1;
-
-   if (st->ctx->Stencil.Enabled) {
-      depth_stencil.stencil.front_enabled = 1;
-      depth_stencil.stencil.front_func = st_compare_func_to_pipe(st->ctx->Stencil.Function[0]);
-      depth_stencil.stencil.front_fail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.FailFunc[0]);
-      depth_stencil.stencil.front_zfail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZFailFunc[0]);
-      depth_stencil.stencil.front_zpass_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZPassFunc[0]);
-      depth_stencil.stencil.ref_value[0] = st->ctx->Stencil.Ref[0] & 0xff;
-      depth_stencil.stencil.value_mask[0] = st->ctx->Stencil.ValueMask[0] & 0xff;
-      depth_stencil.stencil.write_mask[0] = st->ctx->Stencil.WriteMask[0] & 0xff;
-      if (st->ctx->Stencil.TestTwoSide) {
-         depth_stencil.stencil.back_enabled = 1;
-         depth_stencil.stencil.back_func = st_compare_func_to_pipe(st->ctx->Stencil.Function[1]);
-         depth_stencil.stencil.back_fail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.FailFunc[1]);
-         depth_stencil.stencil.back_zfail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZFailFunc[1]);
-         depth_stencil.stencil.back_zpass_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZPassFunc[1]);
-         depth_stencil.stencil.ref_value[1] = st->ctx->Stencil.Ref[1] & 0xff;
-         depth_stencil.stencil.value_mask[1] = st->ctx->Stencil.ValueMask[1] & 0xff;
-         depth_stencil.stencil.write_mask[1] = st->ctx->Stencil.WriteMask[1] & 0xff;
+      dsa->depth.occlusion_count = 1;
+
+   if (st->ctx->Stencil.Enabled && st->ctx->Visual.stencilBits > 0) {
+      dsa->stencil[0].enabled = 1;
+      dsa->stencil[0].func = st_compare_func_to_pipe(st->ctx->Stencil.Function[0]);
+      dsa->stencil[0].fail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.FailFunc[0]);
+      dsa->stencil[0].zfail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZFailFunc[0]);
+      dsa->stencil[0].zpass_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZPassFunc[0]);
+      dsa->stencil[0].ref_value = st->ctx->Stencil.Ref[0] & 0xff;
+      dsa->stencil[0].valuemask = st->ctx->Stencil.ValueMask[0] & 0xff;
+      dsa->stencil[0].writemask = st->ctx->Stencil.WriteMask[0] & 0xff;
+
+      if (st->ctx->Stencil._TestTwoSide) {
+         dsa->stencil[1].enabled = 1;
+         dsa->stencil[1].func = st_compare_func_to_pipe(st->ctx->Stencil.Function[1]);
+         dsa->stencil[1].fail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.FailFunc[1]);
+         dsa->stencil[1].zfail_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZFailFunc[1]);
+         dsa->stencil[1].zpass_op = gl_stencil_op_to_pipe(st->ctx->Stencil.ZPassFunc[1]);
+         dsa->stencil[1].ref_value = st->ctx->Stencil.Ref[1] & 0xff;
+         dsa->stencil[1].valuemask = st->ctx->Stencil.ValueMask[1] & 0xff;
+         dsa->stencil[1].writemask = st->ctx->Stencil.WriteMask[1] & 0xff;
+      }
+      else {
+         dsa->stencil[1] = dsa->stencil[0];
+         dsa->stencil[1].enabled = 0;
       }
    }
 
-   cso = st_cached_depth_stencil_state(st, &depth_stencil);
-   if (st->state.depth_stencil != cso) {
-      /* state has changed */
-      st->state.depth_stencil = cso;
-      st->pipe->bind_depth_stencil_state(st->pipe, cso->data); /* bind new state */
+   if (st->ctx->Color.AlphaEnabled) {
+      dsa->alpha.enabled = 1;
+      dsa->alpha.func = st_compare_func_to_pipe(st->ctx->Color.AlphaFunc);
+      dsa->alpha.ref_value = st->ctx->Color.AlphaRef;
    }
+
+   cso_set_depth_stencil_alpha(st->cso_context, dsa);
 }
 
 
-const struct st_tracked_state st_update_depth_stencil = {
-   .name = "st_update_depth_stencil",
-   .dirty = {
-      .mesa = (_NEW_DEPTH|_NEW_STENCIL),
-      .st  = 0,
+const struct st_tracked_state st_update_depth_stencil_alpha = {
+   "st_update_depth_stencil",                          /* name */
+   {                                                   /* dirty */
+      (_NEW_DEPTH|_NEW_STENCIL|_NEW_COLOR),            /* mesa */
+      0,                                               /* st */
    },
-   .update = update_depth_stencil
+   update_depth_stencil_alpha                          /* update */
 };