Combing depth and stencil objects and making them immutable.

Converting depth and stencil objects into a single state object
(d3d10 like) and making it immutable.

1 files changed, 24 insertions, 24 deletions

diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index b994d17ea9e..30e559b5948 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -146,13 +146,31 @@ struct pipe_shader_state {
    void *executable;
 };
 
-struct pipe_depth_state
+struct pipe_depth_stencil_state
 {
-   unsigned enabled:1;   /**< depth test enabled? */
-   unsigned writemask:1; /**< allow depth buffer writes? */
-   unsigned func:3;      /**< depth test func (PIPE_FUNC_x) */
-   unsigned occlusion_count:1; /**< XXX move this elsewhere? */
-   float clear;      /**< Clear value in [0,1] (XXX correct place?) */
+   struct {
+      unsigned enabled:1;   /**< depth test enabled? */
+      unsigned writemask:1; /**< allow depth buffer writes? */
+      unsigned func:3;      /**< depth test func (PIPE_FUNC_x) */
+      unsigned occlusion_count:1; /**< XXX move this elsewhere? */
+      float clear;      /**< Clear value in [0,1] (XXX correct place?) */
+   } depth;
+   struct {
+      unsigned front_enabled:1;
+      unsigned front_func:3;     /**< PIPE_FUNC_x */
+      unsigned front_fail_op:3;  /**< PIPE_STENCIL_OP_x */
+      unsigned front_zpass_op:3; /**< PIPE_STENCIL_OP_x */
+      unsigned front_zfail_op:3; /**< PIPE_STENCIL_OP_x */
+      unsigned back_enabled:1;
+      unsigned back_func:3;      /**< PIPE_FUNC_x */
+      unsigned back_fail_op:3;   /**< PIPE_STENCIL_OP_x */
+      unsigned back_zpass_op:3;  /**< PIPE_STENCIL_OP_x */
+      unsigned back_zfail_op:3;  /**< PIPE_STENCIL_OP_x */
+      ubyte ref_value[2];    /**< [0] = front, [1] = back */
+      ubyte value_mask[2];
+      ubyte write_mask[2];
+      ubyte clear_value;
+   } stencil;
 };
 
 struct pipe_alpha_test_state {
@@ -188,24 +206,6 @@ struct pipe_clear_color_state
    float color[4];
 };
 
-struct pipe_stencil_state {
-   unsigned front_enabled:1;
-   unsigned front_func:3;     /**< PIPE_FUNC_x */
-   unsigned front_fail_op:3;  /**< PIPE_STENCIL_OP_x */
-   unsigned front_zpass_op:3; /**< PIPE_STENCIL_OP_x */
-   unsigned front_zfail_op:3; /**< PIPE_STENCIL_OP_x */
-   unsigned back_enabled:1;
-   unsigned back_func:3;      /**< PIPE_FUNC_x */
-   unsigned back_fail_op:3;   /**< PIPE_STENCIL_OP_x */
-   unsigned back_zpass_op:3;  /**< PIPE_STENCIL_OP_x */
-   unsigned back_zfail_op:3;  /**< PIPE_STENCIL_OP_x */
-   ubyte ref_value[2];    /**< [0] = front, [1] = back */
-   ubyte value_mask[2];
-   ubyte write_mask[2];
-   ubyte clear_value;
-};
-
-
 struct pipe_framebuffer_state
 {
    /** multiple colorbuffers for multiple render targets */