X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_program.h;h=699b6e8ccb770c2e7e516f6c7ff3106371a61510;hb=9462b8447864c754252cd2580c9e1e4d36d5cc63;hp=e2e5eddef22c170bc0e86de2dcca2d928d42a012;hpb=4df482086ebf0663c708b089d8d8d22de0ef972c;p=mesa.git diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index e2e5eddef22..699b6e8ccb7 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -35,13 +35,47 @@ #define ST_PROGRAM_H #include "main/mtypes.h" -#include "shader/program.h" -#include "pipe/p_shader_tokens.h" +#include "program/program.h" +#include "pipe/p_state.h" +#include "st_context.h" +#include "st_glsl_to_tgsi.h" -struct cso_fragment_shader; -struct cso_vertex_shader; -struct translated_vertex_program; +/** Fragment program variant key */ +struct st_fp_variant_key +{ + struct st_context *st; /**< variants are per-context */ + + /** for glBitmap */ + GLuint bitmap:1; /**< glBitmap variant? */ + + /** for glDrawPixels */ + GLuint drawpixels:1; /**< glDrawPixels variant */ + GLuint scaleAndBias:1; /**< glDrawPixels w/ scale and/or bias? */ + GLuint pixelMaps:1; /**< glDrawPixels w/ pixel lookup map? */ + GLuint drawpixels_z:1; /**< glDrawPixels(GL_DEPTH) */ + GLuint drawpixels_stencil:1; /**< glDrawPixels(GL_STENCIL) */ +}; + + +/** + * Variant of a fragment program. + */ +struct st_fp_variant +{ + /** Parameters which generated this version of fragment program */ + struct st_fp_variant_key key; + + /** Driver's compiled shader */ + void *driver_shader; + + /** For glBitmap variants */ + struct gl_program_parameter_list *parameters; + uint bitmap_sampler; + + /** next in linked list */ + struct st_fp_variant *next; +}; /** @@ -50,30 +84,51 @@ struct translated_vertex_program; struct st_fragment_program { struct gl_fragment_program Base; - GLuint serialNo; + struct glsl_to_tgsi_visitor* glsl_to_tgsi; - GLuint input_to_slot[FRAG_ATTRIB_MAX]; /**< Maps FRAG_ATTRIB_x to slot */ - GLuint num_input_slots; + struct pipe_shader_state tgsi; - /** map FP input back to VP output */ - GLuint input_map[PIPE_MAX_SHADER_INPUTS]; + struct st_fp_variant *variants; +}; - ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; - ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; - struct pipe_shader_state state; - void *driver_shader; - GLuint param_state; +/** Vertex program variant key */ +struct st_vp_variant_key +{ + struct st_context *st; /**< variants are per-context */ + boolean passthrough_edgeflags; +}; + - /** List of vertex programs which have been translated such that their - * outputs match this fragment program's inputs. +/** + * This represents a vertex program, especially translated to match + * the inputs of a particular fragment shader. + */ +struct st_vp_variant +{ + /* Parameters which generated this translated version of a vertex + * shader: */ - struct translated_vertex_program *vertex_programs; + struct st_vp_variant_key key; - /** Program prefixed with glBitmap prologue */ - struct st_fragment_program *bitmap_program; - uint bitmap_sampler; + /** + * TGSI tokens (to later generate a 'draw' module shader for + * selection/feedback/rasterpos) + */ + struct pipe_shader_state tgsi; + + /** Driver's compiled shader */ + void *driver_shader; + + /** For using our private draw module (glRasterPos) */ + struct draw_vertex_shader *draw_shader; + + /** Next in linked list */ + struct st_vp_variant *next; + + /** similar to that in st_vertex_program, but with edgeflags info too */ + GLuint num_inputs; }; @@ -83,25 +138,80 @@ struct st_fragment_program struct st_vertex_program { struct gl_vertex_program Base; /**< The Mesa vertex program */ - GLuint serialNo; + struct glsl_to_tgsi_visitor* glsl_to_tgsi; /** 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 num_inputs; - struct pipe_shader_state state; + /** Maps VERT_RESULT_x to slot */ + GLuint result_to_output[VERT_RESULT_MAX]; + ubyte output_semantic_name[VERT_RESULT_MAX]; + ubyte output_semantic_index[VERT_RESULT_MAX]; + GLuint num_outputs; + + /** List of translated variants of this vertex program. + */ + struct st_vp_variant *variants; +}; + + + +/** Geometry program variant key */ +struct st_gp_variant_key +{ + struct st_context *st; /**< variants are per-context */ + /* no other fields yet */ +}; + + +/** + * Geometry program variant. + */ +struct st_gp_variant +{ + /* Parameters which generated this translated version of a vertex */ + struct st_gp_variant_key key; + void *driver_shader; - /** For using our private draw module (glRasterPos) */ - struct draw_vertex_shader *draw_shader; + struct st_gp_variant *next; +}; + + +/** + * Derived from Mesa gl_geometry_program: + */ +struct st_geometry_program +{ + struct gl_geometry_program Base; /**< The Mesa geometry program */ + struct glsl_to_tgsi_visitor* glsl_to_tgsi; + + /** map GP input back to VP output */ + GLuint input_map[PIPE_MAX_SHADER_INPUTS]; + + /** maps a Mesa GEOM_ATTRIB_x to a packed TGSI input index */ + GLuint input_to_index[GEOM_ATTRIB_MAX]; + /** maps a TGSI input index back to a Mesa GEOM_ATTRIB_x */ + GLuint index_to_input[PIPE_MAX_SHADER_INPUTS]; + + GLuint num_inputs; + + GLuint input_to_slot[GEOM_ATTRIB_MAX]; /**< Maps GEOM_ATTRIB_x to slot */ + GLuint num_input_slots; + + ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; + ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; + + struct pipe_shader_state tgsi; - GLuint param_state; + struct st_gp_variant *variants; }; + static INLINE struct st_fragment_program * st_fragment_program( struct gl_fragment_program *fp ) { @@ -115,6 +225,11 @@ st_vertex_program( struct gl_vertex_program *vp ) return (struct st_vertex_program *)vp; } +static INLINE struct st_geometry_program * +st_geometry_program( struct gl_geometry_program *gp ) +{ + return (struct st_geometry_program *)gp; +} static INLINE void st_reference_vertprog(struct st_context *st, @@ -126,6 +241,16 @@ st_reference_vertprog(struct st_context *st, (struct gl_program *) prog); } +static INLINE void +st_reference_geomprog(struct st_context *st, + struct st_geometry_program **ptr, + struct st_geometry_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, @@ -137,22 +262,51 @@ st_reference_fragprog(struct st_context *st, } +extern struct st_vp_variant * +st_get_vp_variant(struct st_context *st, + struct st_vertex_program *stvp, + const struct st_vp_variant_key *key); + + +extern struct st_fp_variant * +st_get_fp_variant(struct st_context *st, + struct st_fragment_program *stfp, + const struct st_fp_variant_key *key); + + +extern struct st_gp_variant * +st_get_gp_variant(struct st_context *st, + struct st_geometry_program *stgp, + const struct st_gp_variant_key *key); + + extern void -st_translate_fragment_program(struct st_context *st, - struct st_fragment_program *fp, - const GLuint inputMapping[]); +st_prepare_vertex_program(struct gl_context *ctx, + struct st_vertex_program *stvp); + +extern GLboolean +st_prepare_fragment_program(struct gl_context *ctx, + struct st_fragment_program *stfp); 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); +st_release_vp_variants( struct st_context *st, + struct st_vertex_program *stvp ); +extern void +st_release_fp_variants( struct st_context *st, + struct st_fragment_program *stfp ); + +extern void +st_release_gp_variants(struct st_context *st, + struct st_geometry_program *stgp); + + +extern void +st_print_shaders(struct gl_context *ctx); extern void -st_print_shaders(GLcontext *ctx); +st_destroy_program_variants(struct st_context *st); #endif