Basic fragment programs run now.

Handling of constants might change.  For now, the st_fragment_program struct
contains a pipe_constant_buffer (not a pointer).

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index e3f62a80ad7..c3704177b32 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -122,18 +122,18 @@ struct pipe_clip_state {
 };
 
 
-struct pipe_fs_state {
-   GLuint inputs_read;		/* FRAG_ATTRIB_* */
-   const struct tgsi_token *tokens;
-   
-};
-
 struct pipe_constant_buffer {
    GLfloat constant[PIPE_MAX_CONSTANT][4];
    GLuint nr_constants;
 };
 
 
+struct pipe_fs_state {
+   GLuint inputs_read;		/* FRAG_ATTRIB_* */
+   const struct tgsi_token *tokens;
+   struct pipe_constant_buffer *constants; /* XXX temporary? */
+};
+
 struct pipe_depth_state
 {
    GLuint enabled:1;   /**< depth test enabled? */