Convert shader to an immutable state object.

1 files changed, 10 insertions, 6 deletions

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index dda758fe6a..c405051bce 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -117,6 +117,16 @@ struct pipe_context {
    void (*delete_depth_stencil_state)(struct pipe_context *,
                                       const struct pipe_depth_stencil_state *);
 
+   const struct pipe_shader_state * (*create_shader_state)(
+      struct pipe_context *,
+      const struct pipe_shader_state *);
+   void (*bind_fs_state)(struct pipe_context *,
+                         const struct pipe_shader_state *);
+   void (*bind_vs_state)(struct pipe_context *,
+                         const struct pipe_shader_state *);
+   void (*delete_shader_state)(struct pipe_context *,
+                               const struct pipe_shader_state *);
+
    void (*set_alpha_test_state)( struct pipe_context *,
                                  const struct pipe_alpha_test_state * );
 
@@ -139,12 +149,6 @@ struct pipe_context {
    void (*set_framebuffer_state)( struct pipe_context *,
                                   const struct pipe_framebuffer_state * );
 
-   void (*set_fs_state)( struct pipe_context *,
-			 const struct pipe_shader_state * );
-
-   void (*set_vs_state)( struct pipe_context *,
-			 const struct pipe_shader_state * );
-
    void (*set_polygon_stipple)( struct pipe_context *,
 				const struct pipe_poly_stipple * );