Rework of shader constant buffers.

They're now totally independent of the actual shaders.
Also, implemented in terms of pipe_buffer_handles/objects.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 35774a790e2..38d6a3ed86e 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -71,16 +71,17 @@ struct st_context
       struct pipe_blend_color  blend_color;
       struct pipe_clear_color_state clear_color;
       struct pipe_clip_state clip;
+      struct pipe_constant_buffer constants[2];
       struct pipe_depth_state depth;
       struct pipe_framebuffer_state framebuffer;
-      struct pipe_shader_state fs;
-      struct pipe_shader_state vs;
+      struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
       struct pipe_poly_stipple poly_stipple;
       struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS];
       struct pipe_scissor_state scissor;
       struct pipe_setup_state  setup;
+      struct pipe_shader_state fs;
+      struct pipe_shader_state vs;
       struct pipe_stencil_state stencil;
-      struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
       struct pipe_viewport_state viewport;
    } state;