st/mesa: rename var and update st_choose_format() comments

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

diff --git a/src/mesa/state_tracker/st_cache.h b/src/mesa/state_tracker/st_cache.h
index a06af311237522094f2d6457153c87deac5f23f8..b81de316ec990854d4b3a1aea1b6ddeee575c939 100644 (file)
--- a/src/mesa/state_tracker/st_cache.h
+++ b/src/mesa/state_tracker/st_cache.h
@@ -33,24 +33,36 @@
 #ifndef ST_CACHE_H
 #define ST_CACHE_H
 
+#include "cso_cache/cso_cache.h"
+
 struct pipe_blend_state;
 struct pipe_sampler_state;
 struct st_context;
 
-struct pipe_blend_state * st_cached_blend_state(
-   struct st_context *st,
-   const struct pipe_blend_state *blend);
 
-struct pipe_sampler_state * st_cached_sampler_state(
-   struct st_context *st,
-   const struct pipe_sampler_state *sampler);
+const struct cso_blend *
+st_cached_blend_state(struct st_context *st,
+                      const struct pipe_blend_state *blend);
+
+const struct cso_sampler *
+st_cached_sampler_state(struct st_context *st,
+                        const struct pipe_sampler_state *sampler);
+
+const struct cso_depth_stencil_alpha *
+st_cached_depth_stencil_alpha_state(struct st_context *st,
+                              const struct pipe_depth_stencil_alpha_state *depth_stencil);
+
+const struct cso_rasterizer *
+st_cached_rasterizer_state(struct st_context *st,
+                           const struct pipe_rasterizer_state *raster);
+
+const struct cso_fragment_shader *
+st_cached_fs_state(struct st_context *st,
+                   const struct pipe_shader_state *templ);
 
-struct pipe_depth_stencil_state *st_cached_depth_stencil_state(
-   struct st_context *st,
-   const struct pipe_depth_stencil_state *depth_stencil);
 
-struct pipe_rasterizer_state *st_cached_rasterizer_state(
-   struct st_context *st,
-   const struct pipe_rasterizer_state *raster);
+const struct cso_vertex_shader *
+st_cached_vs_state(struct st_context *st,
+                   const struct pipe_shader_state *templ);
 
 #endif