st/mesa: fix crash when using both user and vbo buffers with the same stride

[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 fb0ff0d4db85a0d65e21f5e437923ad884227f72..6d5de7b13adc5cc8e3f5292c41e50a6b55364464 100644 (file)
--- a/src/mesa/state_tracker/st_cache.h
+++ b/src/mesa/state_tracker/st_cache.h
@@ -33,35 +33,37 @@
 #ifndef ST_CACHE_H
 #define ST_CACHE_H
 
-#include "pipe/cso_cache/cso_cache.h"
-
 struct pipe_blend_state;
+struct pipe_depth_stencil_alpha_state;
+struct pipe_rasterizer_state;
 struct pipe_sampler_state;
+struct pipe_shader_state;
 struct st_context;
 
+
 const struct cso_blend *
 st_cached_blend_state(struct st_context *st,
                       const struct pipe_blend_state *blend);
 
-struct pipe_sampler_state *
+const struct cso_sampler *
 st_cached_sampler_state(struct st_context *st,
                         const struct pipe_sampler_state *sampler);
 
-struct pipe_depth_stencil_state *st_cached_depth_stencil_state(
-   struct st_context *st,
-   const struct pipe_depth_stencil_state *depth_stencil);
+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);
 
-struct pipe_rasterizer_state *st_cached_rasterizer_state(
-   struct st_context *st,
-   const struct pipe_rasterizer_state *raster);
+const struct cso_rasterizer *
+st_cached_rasterizer_state(struct st_context *st,
+                           const struct pipe_rasterizer_state *raster);
 
-struct pipe_shader_state *st_cached_fs_state(
-   struct st_context *st,
-   const struct pipe_shader_state *templ);
+const struct cso_fragment_shader *
+st_cached_fs_state(struct st_context *st,
+                   const struct pipe_shader_state *templ);
 
 
-struct pipe_shader_state *st_cached_vs_state(
-   struct st_context *st,
-   const struct pipe_shader_state *templ);
+const struct cso_vertex_shader *
+st_cached_vs_state(struct st_context *st,
+                   const struct pipe_shader_state *templ);
 
 #endif