Stencil state.

8 files changed, 183 insertions, 0 deletions

diff --git a/src/mesa/softpipe/sp_context.h b/src/mesa/softpipe/sp_context.h
index 726cb96388..e047a9330b 100644
--- a/src/mesa/softpipe/sp_context.h
+++ b/src/mesa/softpipe/sp_context.h
@@ -52,6 +52,9 @@ struct softpipe_context {
    void (*set_scissor_rect)( struct softpipe_context *,
 			     const struct softpipe_scissor_rect * );
 
+   void (*set_stencil_state)( struct softpipe_context *,
+                              const struct softpipe_stencil_state * );
+
    void (*set_blend_state)( struct softpipe_context *,
                             const struct softpipe_blend_state * );
 
diff --git a/src/mesa/softpipe/sp_defines.h b/src/mesa/softpipe/sp_defines.h
index f47d782285..bc88e3d71e 100644
--- a/src/mesa/softpipe/sp_defines.h
+++ b/src/mesa/softpipe/sp_defines.h
@@ -71,4 +71,22 @@
 #define SP_LOGICOP_OR               14
 #define SP_LOGICOP_SET              15  
 
+#define SP_STENCIL_FUNC_NEVER    0
+#define SP_STENCIL_FUNC_LESS     1
+#define SP_STENCIL_FUNC_EQUAL    2
+#define SP_STENCIL_FUNC_LEQUAL   3
+#define SP_STENCIL_FUNC_GREATER  4
+#define SP_STENCIL_FUNC_NOTEQUAL 5
+#define SP_STENCIL_FUNC_GEQUAL   6
+#define SP_STENCIL_FUNC_ALWAYS   7
+
+#define SP_STENCIL_OP_KEEP       0
+#define SP_STENCIL_OP_ZERO       1
+#define SP_STENCIL_OP_REPLACE    2
+#define SP_STENCIL_OP_INCR       3
+#define SP_STENCIL_OP_DECR       4
+#define SP_STENCIL_OP_INCR_WRAP  5
+#define SP_STENCIL_OP_DECR_WRAP  6
+#define SP_STENCIL_OP_INVERT     7
+
 #endif
diff --git a/src/mesa/softpipe/sp_state.h b/src/mesa/softpipe/sp_state.h
index 29bba916a1..73ed7a619c 100644
--- a/src/mesa/softpipe/sp_state.h
+++ b/src/mesa/softpipe/sp_state.h
@@ -120,6 +120,24 @@ struct softpipe_blend_color {
 };
 
 
+struct softpipe_stencil_state {
+   GLuint front_enabled:1;
+   GLuint front_func:3;     /**< SP_STENCIL_FUNC_x */
+   GLuint front_fail_op:3;  /**< SP_STENCIL_OP_x */
+   GLuint front_zpass_op:3; /**< SP_STENCIL_OP_x */
+   GLuint front_zfail_op:3; /**< SP_STENCIL_OP_x */
+   GLuint back_enabled:1;
+   GLuint back_func:3;
+   GLuint back_fail_op:3;
+   GLuint back_zpass_op:3;
+   GLuint back_zfail_op:3;
+   GLint ref_value[2];      /**< [0] = front, [1] = back */
+   GLuint value_mask[2];
+   GLuint write_mask[2];
+   GLuint clear_value;
+};
+
+
 /* This will change for hardware softpipes...
  */
 struct softpipe_surface {
diff --git a/src/mesa/softpipe/state_tracker/st_atom.c b/src/mesa/softpipe/state_tracker/st_atom.c
index 5f426f040a..fdbfb9021d 100644
--- a/src/mesa/softpipe/state_tracker/st_atom.c
+++ b/src/mesa/softpipe/state_tracker/st_atom.c
@@ -49,6 +49,7 @@ static const struct st_tracked_state *atoms[] =
    &st_update_viewport,
    &st_update_scissor,
    &st_update_blend,
+   &st_update_stencil,
    /* will be patched out at runtime */
 /*    &st_update_constants */
 };
diff --git a/src/mesa/softpipe/state_tracker/st_atom.h b/src/mesa/softpipe/state_tracker/st_atom.h
index dc8397adce..8dc7460d11 100644
--- a/src/mesa/softpipe/state_tracker/st_atom.h
+++ b/src/mesa/softpipe/state_tracker/st_atom.h
@@ -52,6 +52,7 @@ const struct st_tracked_state st_update_viewport;
 const struct st_tracked_state st_update_constants;
 const struct st_tracked_state st_update_scissor;
 const struct st_tracked_state st_update_blend;
+const struct st_tracked_state st_update_stencil;
 
 
 #endif
diff --git a/src/mesa/softpipe/state_tracker/st_atom_stencil.c b/src/mesa/softpipe/state_tracker/st_atom_stencil.c
new file mode 100644
index 0000000000..ac8de03702
--- /dev/null
+++ b/src/mesa/softpipe/state_tracker/st_atom_stencil.c
@@ -0,0 +1,140 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  *   Brian Paul
+  */
+ 
+
+#include "st_context.h"
+#include "st_atom.h"
+#include "softpipe/sp_context.h"
+#include "softpipe/sp_defines.h"
+
+
+/**
+ * Convert GLenum stencil func tokens to softpipe tokens.
+ */
+static GLuint
+gl_stencil_func_to_sp(GLenum func)
+{
+   /* Same values, just biased */
+   assert(SP_STENCIL_FUNC_NEVER == GL_NEVER - GL_NEVER);
+   assert(SP_STENCIL_FUNC_LESS == GL_LESS - GL_NEVER);
+   assert(SP_STENCIL_FUNC_EQUAL == GL_EQUAL - GL_NEVER);
+   assert(SP_STENCIL_FUNC_LEQUAL == GL_LEQUAL - GL_NEVER);
+   assert(SP_STENCIL_FUNC_GREATER == GL_GREATER - GL_NEVER);
+   assert(SP_STENCIL_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);
+   assert(SP_STENCIL_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);
+   assert(SP_STENCIL_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);
+   assert(func >= GL_NEVER);
+   assert(func <= GL_ALWAYS);
+   return func - GL_NEVER;
+}
+
+
+/**
+ * Convert GLenum stencil op tokens to softpipe tokens.
+ */
+static GLuint
+gl_stencil_op_to_sp(GLenum func)
+{
+   switch (func) {
+   case GL_KEEP:
+      return SP_STENCIL_OP_KEEP;
+   case GL_ZERO:
+      return SP_STENCIL_OP_ZERO;
+   case GL_REPLACE:
+      return SP_STENCIL_OP_REPLACE;
+   case GL_INCR:
+      return SP_STENCIL_OP_INCR;
+   case GL_DECR:
+      return SP_STENCIL_OP_DECR;
+   case GL_INCR_WRAP:
+      return SP_STENCIL_OP_INCR_WRAP;
+   case GL_DECR_WRAP:
+      return SP_STENCIL_OP_DECR_WRAP;
+   case GL_INVERT:
+      return SP_STENCIL_OP_INVERT;
+   default:
+      assert("invalid GL token in gl_stencil_op_to_sp()" == NULL);
+      return 0;
+   }
+}
+
+
+static void 
+update_stencil( struct st_context *st )
+{
+   struct softpipe_stencil_state stencil;
+
+   memset(&stencil, 0, sizeof(stencil));
+
+   if (st->ctx->Stencil.Enabled) {
+      stencil.front_enabled = 1;
+      stencil.front_func = gl_stencil_func_to_sp(st->ctx->Stencil.Function[0]);
+      stencil.front_fail_op = gl_stencil_op_to_sp(st->ctx->Stencil.FailFunc[0]);
+      stencil.front_zfail_op = gl_stencil_op_to_sp(st->ctx->Stencil.ZFailFunc[0]);
+      stencil.front_zpass_op = gl_stencil_op_to_sp(st->ctx->Stencil.ZPassFunc[0]);
+      stencil.ref_value[0] = st->ctx->Stencil.Ref[0];
+      stencil.value_mask[0] = st->ctx->Stencil.ValueMask[0];
+      stencil.write_mask[0] = st->ctx->Stencil.WriteMask[0];
+      if (st->ctx->Stencil.TestTwoSide) {
+         stencil.back_enabled = 1;
+         stencil.back_func = gl_stencil_func_to_sp(st->ctx->Stencil.Function[1]);
+         stencil.back_fail_op = gl_stencil_op_to_sp(st->ctx->Stencil.FailFunc[1]);
+         stencil.back_zfail_op = gl_stencil_op_to_sp(st->ctx->Stencil.ZFailFunc[1]);
+         stencil.back_zpass_op = gl_stencil_op_to_sp(st->ctx->Stencil.ZPassFunc[1]);
+         stencil.ref_value[1] = st->ctx->Stencil.Ref[1];
+         stencil.value_mask[1] = st->ctx->Stencil.ValueMask[1];
+         stencil.write_mask[1] = st->ctx->Stencil.WriteMask[1];
+      }
+      stencil.clear_value = st->ctx->Stencil.Clear;
+   }
+
+   if (memcmp(&stencil, &st->state.stencil, sizeof(stencil)) != 0) {
+      /* state has changed */
+      st->state.stencil = stencil;  /* struct copy */
+      st->softpipe->set_stencil_state(st->softpipe, &stencil); /* set new state */
+   }
+}
+
+
+const struct st_tracked_state st_update_stencil = {
+   .dirty = {
+      .mesa = (_NEW_STENCIL),
+      .st  = 0,
+   },
+   .update = update_stencil
+};
+
+
+
+
+
diff --git a/src/mesa/softpipe/state_tracker/st_context.h b/src/mesa/softpipe/state_tracker/st_context.h
index 08cee11797..5ff10c1b1f 100644
--- a/src/mesa/softpipe/state_tracker/st_context.h
+++ b/src/mesa/softpipe/state_tracker/st_context.h
@@ -73,6 +73,7 @@ struct st_context
       struct softpipe_clip_state   clip;
       struct softpipe_scissor_rect scissor;
       struct softpipe_poly_stipple poly_stipple;
+      struct softpipe_stencil_state stencil;
    } state;
 
    struct {
diff --git a/src/mesa/sources b/src/mesa/sources
index 74c92bb381..c5ee7d9611 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -178,6 +178,7 @@ SOFTPIPE_SOURCES = \
 	softpipe/state_tracker/st_atom_clip.c \
 	softpipe/state_tracker/st_atom_fs.c \
 	softpipe/state_tracker/st_atom_scissor.c \
+	softpipe/state_tracker/st_atom_stencil.c \
 	softpipe/state_tracker/st_atom_setup.c \
 	softpipe/state_tracker/st_atom_viewport.c \
 	softpipe/state_tracker/st_cb_program.c \