st/mesa: simplify the signature of st_release_basic_variants

[mesa.git] / src / mesa / state_tracker / st_program.h

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index caaa779287ade1ca089d6983a09e0f979943ef74..4b0fcff96a78de90285140e4d8ae1638f720141d 100644 (file)
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -123,6 +123,9 @@ struct st_fp_variant_key
    /** needed for ATI_fragment_shader */
    GLuint fog:2;
 
+   /** for ARB_depth_clamp */
+   GLuint lower_depth_clamp:1;
+
    /** needed for ATI_fragment_shader */
    char texture_targets[MAX_NUM_FRAGMENT_REGISTERS_ATI];
 
@@ -179,10 +182,14 @@ struct st_fragment_program
 struct st_vp_variant_key
 {
    struct st_context *st;          /**< variants are per-context */
-   boolean passthrough_edgeflags;
+   bool passthrough_edgeflags;
 
    /** for ARB_color_buffer_float */
-   boolean clamp_color;
+   bool clamp_color;
+
+   /** both for ARB_depth_clamp */
+   bool lower_depth_clamp;
+   bool clip_negative_one_to_one;
 };
 
 
@@ -262,6 +269,11 @@ struct st_basic_variant_key
 
    /** For compat profile */
    bool clamp_color;
+
+   /** both for ARB_depth_clamp */
+   bool lower_depth_clamp;
+   bool clip_negative_one_to_one;
+
 };
 
 
@@ -438,9 +450,7 @@ st_release_cp_variants(struct st_context *st,
                         struct st_compute_program *stcp);
 
 extern void
-st_release_basic_variants(struct st_context *st, GLenum target,
-                          struct st_basic_variant **variants,
-                          struct pipe_shader_state *tgsi);
+st_release_basic_variants(struct st_context *st, struct st_common_program *p);
 
 extern void
 st_destroy_program_variants(struct st_context *st);