#ifndef ST_PROGRAM_H
#define ST_PROGRAM_H
-#include "mtypes.h"
-#include "pipe/tgsi/exec/tgsi_token.h"
-#include "x86/rtasm/x86sse.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 id; /**< String id, for tracking ProgramStringNotify changes. */
+ GLuint serialNo;
+
+ GLuint input_to_slot[FRAG_ATTRIB_MAX]; /**< Maps FRAG_ATTRIB_x to slot */
+ GLuint num_input_slots;
+ /** map FP input back to VP output */
+ GLuint input_map[PIPE_MAX_SHADER_INPUTS];
- struct tgsi_token tokens[ST_FP_MAX_TOKENS];
- GLboolean dirty;
+ ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];
+ ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
- /** Pointer to the corresponding cached shader */
- const struct pipe_shader_state *fs;
+ struct pipe_shader_state state;
+ void *driver_shader;
GLuint param_state;
+
+ /** List of vertex programs which have been translated such that their
+ * outputs match this fragment program's inputs.
+ */
+ struct translated_vertex_program *vertex_programs;
+
+ /** 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; /**< The Mesa vertex program */
- GLboolean error; /**< Set if program is malformed for any reason. */
- GLuint id; /**< String id, for tracking ProgramStringNotify changes. */
+ GLuint serialNo;
/** maps a Mesa VERT_ATTRIB_x to a packed TGSI input index */
- GLuint input_to_index[MAX_VERTEX_PROGRAM_ATTRIBS];
+ GLuint input_to_index[VERT_ATTRIB_MAX];
/** maps a TGSI input index back to a Mesa VERT_ATTRIB_x */
- GLuint index_to_input[MAX_VERTEX_PROGRAM_ATTRIBS];
+ GLuint index_to_input[PIPE_MAX_SHADER_INPUTS];
-#if 0
- GLuint output_to_index[MAX_VERTEX_PROGRAM_ATTRIBS];
- GLuint index_to_output[MAX_VERTEX_PROGRAM_ATTRIBS];
-#endif
+ GLuint num_inputs;
- /** The program in TGSI format */
- struct tgsi_token tokens[ST_FP_MAX_TOKENS];
- GLboolean dirty;
+ struct pipe_shader_state state;
+ void *driver_shader;
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
- struct x86_function sse2_program;
-#endif
-
- /** Pointer to the corresponding cached shader */
- const struct pipe_shader_state *vs;
+ /** For using our private draw module (glRasterPos) */
+ struct draw_vertex_shader *draw_shader;
GLuint param_state;
};
-extern void st_init_program_functions(struct dd_function_table *functions);
-
-
-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;
}
-extern struct pipe_shader_state *
-st_translate_fragment_shader(struct st_context *st,
- struct st_fragment_program *fp);
+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 struct pipe_shader_state *
-st_translate_vertex_shader(struct st_context *st,
- struct st_vertex_program *vp);
+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