gallium: remove clear values from depth, stencil state

diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 56d4f96ed7609de3315e8d7da806630d9ccec42b..a571071ea99c0e74d6673e68c12e2e91e0a026ae 100644 (file)
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -152,7 +152,6 @@ struct pipe_depth_stencil_state
       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;
@@ -168,7 +167,6 @@ struct pipe_depth_stencil_state
       ubyte ref_value[2];    /**< [0] = front, [1] = back */
       ubyte value_mask[2];
       ubyte write_mask[2];
-      ubyte clear_value;
    } stencil;
 };
 

diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index f0f360e6ddf8e28f480b574bfaff40a884c59e2e..e785434cecfeef03394b4d68c3a1fbec8925e597 100644 (file)
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -101,7 +101,6 @@ update_depth_stencil(struct st_context *st)
    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);
-   depth_stencil.depth.clear = st->ctx->Depth.Clear;
 
    if (st->ctx->Query.CurrentOcclusionObject &&
        st->ctx->Query.CurrentOcclusionObject->Active)
@@ -126,7 +125,6 @@ update_depth_stencil(struct st_context *st)
          depth_stencil.stencil.value_mask[1] = st->ctx->Stencil.ValueMask[1] & 0xff;
          depth_stencil.stencil.write_mask[1] = st->ctx->Stencil.WriteMask[1] & 0xff;
       }
-      depth_stencil.stencil.clear_value = st->ctx->Stencil.Clear & 0xff;
    }
 
    cso = st_cached_depth_stencil_state(st, &depth_stencil);