Merge commit 'origin/master' into gallium-0.2

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

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index f6d5f6d76ce761db7f4fe94d8f502150546a2d4f..078e2c42a6960bf60c8cb9d34e6384e37e7ccb3d 100644 (file)
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -34,72 +34,121 @@
 #ifndef ST_PROGRAM_H
 #define ST_PROGRAM_H
 
-#include "mtypes.h"
-#include "pipe/tgsi/core/tgsi_token.h"
+#include "main/mtypes.h"
+#include "shader/program.h"
+#include "pipe/p_shader_tokens.h"
 
-#define ST_FP_MAX_TOKENS 1024
 
+struct cso_fragment_shader;
+struct cso_vertex_shader;
+struct translated_vertex_program;
 
+
+/**
+ * Derived from Mesa gl_fragment_program:
+ */
 struct st_fragment_program
 {
    struct gl_fragment_program Base;
-   GLboolean error;             /* If program is malformed for any reason. */
+   GLuint serialNo;
+
+   GLuint input_to_slot[FRAG_ATTRIB_MAX];  /**< Maps FRAG_ATTRIB_x to slot */
+   GLuint num_input_slots;
 
-   GLuint    id;               /* String id, for tracking
-                                * ProgramStringNotify changes.
-                                */
+   /** map FP input back to VP output */
+   GLuint input_map[PIPE_MAX_SHADER_INPUTS];
 
+   ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];
+   ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
 
-   struct tgsi_token tokens[ST_FP_MAX_TOKENS];
-   GLboolean dirty;
-   
-   struct pipe_constant_buffer constants;
+   struct pipe_shader_state state;
+   void *driver_shader;
 
-#if 0   
-   GLfloat (*cbuffer)[4];
-   GLuint nr_constants;
+   GLuint param_state;
 
-   /* Translate all the parameters, etc, into a constant buffer which
-    * we update on state changes.
+   /** List of vertex programs which have been translated such that their
+    * outputs match this fragment program's inputs.
     */
-   struct
-   {
-      GLuint reg;               /* Constant idx */
-      const GLfloat *values;    /* Pointer to tracked values */
-   } *param;
-   GLuint nr_params;
-#endif
+   struct translated_vertex_program *vertex_programs;
 
-   GLuint param_state;
+   /** Program prefixed with glBitmap prologue */
+   struct st_fragment_program *bitmap_program;
+   uint bitmap_sampler;
 };
 
 
+/**
+ * Derived from Mesa gl_fragment_program:
+ */
 struct st_vertex_program
 {
-   struct gl_vertex_program Base;
-   GLboolean error;             /* If program is malformed for any reason. */
+   struct gl_vertex_program Base;  /**< The Mesa vertex program */
+   GLuint serialNo;
+
+   /** maps a Mesa VERT_ATTRIB_x to a packed TGSI input index */
+   GLuint input_to_index[VERT_ATTRIB_MAX];
+   /** maps a TGSI input index back to a Mesa VERT_ATTRIB_x */
+   GLuint index_to_input[PIPE_MAX_SHADER_INPUTS];
 
-   GLuint    id;               /* String id, for tracking
-                                * ProgramStringNotify changes.
-                                */
+   GLuint num_inputs;
+
+   struct pipe_shader_state state;
+   void *driver_shader;
+
+   /** For using our private draw module (glRasterPos) */
+   struct draw_vertex_shader *draw_shader;
 
-   GLboolean dirty;
    GLuint param_state;
 };
 
-void st_init_cb_program( struct st_context *st );
-void st_destroy_cb_program( struct st_context *st );
 
-static inline struct st_fragment_program *
+static INLINE struct st_fragment_program *
 st_fragment_program( struct gl_fragment_program *fp )
 {
    return (struct st_fragment_program *)fp;
 }
 
-static inline struct st_vertex_program *
+
+static INLINE struct st_vertex_program *
 st_vertex_program( struct gl_vertex_program *vp )
 {
    return (struct st_vertex_program *)vp;
 }
 
+
+static INLINE void
+st_reference_vertprog(struct st_context *st,
+                      struct st_vertex_program **ptr,
+                      struct st_vertex_program *prog)
+{
+   _mesa_reference_program(st->ctx,
+                           (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+static INLINE void
+st_reference_fragprog(struct st_context *st,
+                      struct st_fragment_program **ptr,
+                      struct st_fragment_program *prog)
+{
+   _mesa_reference_program(st->ctx,
+                           (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+
+extern void
+st_translate_fragment_program(struct st_context *st,
+                              struct st_fragment_program *fp,
+                              const GLuint inputMapping[]);
+
+
+extern void
+st_translate_vertex_program(struct st_context *st,
+                            struct st_vertex_program *vp,
+                            const GLuint vert_output_to_slot[],
+                            const ubyte *fs_input_semantic_name,
+                            const ubyte *fs_input_semantic_index);
+
+
 #endif