X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_atom_depth.c;h=2d617bd95dcae756cf82b2ed883af3fb8680ed69;hb=d6888e811d24eaa7e8d9093be606394f00435c05;hp=df05c79e365446683ed46fc953ca6f03bb133e25;hpb=4185da4681405f3cc4d0cc601d428f2f44d0dda8;p=mesa.git

diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index df05c79e365..2d617bd95dc 100644
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -29,6 +29,7 @@
   * Authors:
   *   Keith Whitwell <keith@tungstengraphics.com>
   *   Brian Paul
+  *   Zack  Rusin
   */
  
 
@@ -36,13 +37,14 @@
 #include "st_atom.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
+#include "cso_cache/cso_context.h"
 
 
 /**
- * Convert GLenum depth func tokens to pipe tokens.
+ * Convert an OpenGL compare mode to a pipe tokens.
  */
-static GLuint
-gl_depth_func_to_sp(GLenum func)
+GLuint
+st_compare_func_to_pipe(GLenum func)
 {
    /* Same values, just biased */
    assert(PIPE_FUNC_NEVER == GL_NEVER - GL_NEVER);
@@ -59,35 +61,91 @@ gl_depth_func_to_sp(GLenum func)
 }
 
 
-static void 
-update_depth( struct st_context *st )
+/**
+ * Convert GLenum stencil op tokens to pipe tokens.
+ */
+static GLuint
+gl_stencil_op_to_pipe(GLenum func)
+{
+   switch (func) {
+   case GL_KEEP:
+      return PIPE_STENCIL_OP_KEEP;
+   case GL_ZERO:
+      return PIPE_STENCIL_OP_ZERO;
+   case GL_REPLACE:
+      return PIPE_STENCIL_OP_REPLACE;
+   case GL_INCR:
+      return PIPE_STENCIL_OP_INCR;
+   case GL_DECR:
+      return PIPE_STENCIL_OP_DECR;
+   case GL_INCR_WRAP:
+      return PIPE_STENCIL_OP_INCR_WRAP;
+   case GL_DECR_WRAP:
+      return PIPE_STENCIL_OP_DECR_WRAP;
+   case GL_INVERT:
+      return PIPE_STENCIL_OP_INVERT;
+   default:
+      assert("invalid GL token in gl_stencil_op_to_pipe()" == NULL);
+      return 0;
+   }
+}
+
+static void
+update_depth_stencil_alpha(struct st_context *st)
 {
-   struct pipe_depth_state depth;
+   struct pipe_depth_stencil_alpha_state *dsa = &st->state.depth_stencil;
 
-   memset(&depth, 0, sizeof(depth));
+   memset(dsa, 0, sizeof(*dsa));
 
-   depth.enabled = st->ctx->Depth.Test;
-   depth.writemask = st->ctx->Depth.Mask;
-   depth.func = gl_depth_func_to_sp(st->ctx->Depth.Func);
-   depth.clear = st->ctx->Depth.Clear;
+   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.occlusion_count = 1;
+      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 (memcmp(&depth, &st->state.depth, sizeof(depth)) != 0) {
-      /* state has changed */
-      st->state.depth = depth;  /* struct copy */
-      st->pipe->set_depth_state(st->pipe, &depth); /* set new state */
+      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;
+      }
    }
+
+   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 = {
-   .name = "st_update_depth",
-   .dirty = {
-      .mesa = (_NEW_DEPTH),
-      .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
+   update_depth_stencil_alpha				/* update */
 };