X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_program.h;h=f67ea5eb2087cccde456eb314d40b75e02fc0f02;hb=4a29ee186195ab38a81280cefb6a476e3763da11;hp=d9b53ac008ccdfe6f3e1886764036f59df8dba1b;hpb=e5073e8d0c1ea98c7e5cfff8fe69cd779bc129d9;p=mesa.git diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index d9b53ac008c..f67ea5eb208 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -35,17 +35,53 @@ #define ST_PROGRAM_H #include "main/mtypes.h" +#include "main/atifragshader.h" #include "program/program.h" #include "pipe/p_state.h" +#include "tgsi/tgsi_from_mesa.h" #include "st_context.h" +#include "st_texture.h" #include "st_glsl_to_tgsi.h" - #ifdef __cplusplus extern "C" { #endif -#define ST_DOUBLE_ATTRIB_PLACEHOLDER 0xffffffff +#define ST_DOUBLE_ATTRIB_PLACEHOLDER 0xff + +struct st_external_sampler_key +{ + GLuint lower_nv12; /**< bitmask of 2 plane YUV samplers */ + GLuint lower_iyuv; /**< bitmask of 3 plane YUV samplers */ +}; + +static inline struct st_external_sampler_key +st_get_external_sampler_key(struct st_context *st, struct gl_program *prog) +{ + unsigned mask = prog->ExternalSamplersUsed; + struct st_external_sampler_key key; + + memset(&key, 0, sizeof(key)); + + while (unlikely(mask)) { + unsigned unit = u_bit_scan(&mask); + struct st_texture_object *stObj = + st_get_texture_object(st->ctx, prog, unit); + + switch (st_get_view_format(stObj)) { + case PIPE_FORMAT_NV12: + key.lower_nv12 |= (1 << unit); + break; + case PIPE_FORMAT_IYUV: + key.lower_iyuv |= (1 << unit); + break; + default: + break; + } + } + + return key; +} /** Fragment program variant key */ struct st_fp_variant_key @@ -65,6 +101,14 @@ struct st_fp_variant_key /** for ARB_sample_shading */ GLuint persample_shading:1; + + /** needed for ATI_fragment_shader */ + GLuint fog:2; + + /** needed for ATI_fragment_shader */ + char texture_targets[MAX_NUM_FRAGMENT_REGISTERS_ATI]; + + struct st_external_sampler_key external; }; @@ -80,7 +124,6 @@ struct st_fp_variant void *driver_shader; /** For glBitmap variants */ - struct gl_program_parameter_list *parameters; uint bitmap_sampler; /** For glDrawPixels variants */ @@ -93,15 +136,23 @@ struct st_fp_variant /** - * Derived from Mesa gl_fragment_program: + * Derived from Mesa gl_program: */ struct st_fragment_program { - struct gl_fragment_program Base; + struct gl_program Base; struct pipe_shader_state tgsi; struct glsl_to_tgsi_visitor* glsl_to_tgsi; + struct ati_fragment_shader *ati_fs; + uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */ + + /* used when bypassing glsl_to_tgsi: */ + struct gl_shader_program *shader_program; struct st_fp_variant *variants; + + /* Used by the shader cache and ARB_get_program_binary */ + unsigned num_tgsi_tokens; }; @@ -145,170 +196,137 @@ struct st_vp_variant /** similar to that in st_vertex_program, but with edgeflags info too */ GLuint num_inputs; + + /** Bitfield of VERT_BIT_* bits of mesa vertex processing inputs */ + GLbitfield vert_attrib_mask; }; /** - * Derived from Mesa gl_fragment_program: + * Derived from Mesa gl_program: */ struct st_vertex_program { - struct gl_vertex_program Base; /**< The Mesa vertex program */ + struct gl_program Base; /**< The Mesa vertex program */ struct pipe_shader_state tgsi; struct glsl_to_tgsi_visitor* glsl_to_tgsi; + uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */ + + /* used when bypassing glsl_to_tgsi: */ + struct gl_shader_program *shader_program; - /** maps a Mesa VERT_ATTRIB_x to a packed TGSI input index */ /** maps a TGSI input index back to a Mesa VERT_ATTRIB_x */ - GLuint index_to_input[PIPE_MAX_SHADER_INPUTS]; - GLuint num_inputs; + ubyte index_to_input[PIPE_MAX_ATTRIBS]; + ubyte num_inputs; + /** Reverse mapping of the above */ + ubyte input_to_index[VERT_ATTRIB_MAX]; /** Maps VARYING_SLOT_x to slot */ - GLuint result_to_output[VARYING_SLOT_MAX]; + ubyte result_to_output[VARYING_SLOT_MAX]; /** List of translated variants of this vertex program. */ struct st_vp_variant *variants; -}; + /** SHA1 hash of linked tgsi shader program, used for on-disk cache */ + unsigned char sha1[20]; - -/** Geometry program variant key */ -struct st_gp_variant_key -{ - struct st_context *st; /**< variants are per-context */ - /* no other fields yet */ + /* Used by the shader cache and ARB_get_program_binary */ + unsigned num_tgsi_tokens; }; -/** - * Geometry program variant. - */ -struct st_gp_variant -{ - /* Parameters which generated this variant. */ - struct st_gp_variant_key key; - - void *driver_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 pipe_shader_state tgsi; - struct glsl_to_tgsi_visitor* glsl_to_tgsi; - - struct st_gp_variant *variants; -}; - - - -/** Tessellation control program variant key */ -struct st_tcp_variant_key +/** Key shared by all shaders except VP, FP */ +struct st_basic_variant_key { struct st_context *st; /**< variants are per-context */ - /* no other fields yet */ }; /** - * Tessellation control program variant. + * Geometry program variant. */ -struct st_tcp_variant +struct st_basic_variant { /* Parameters which generated this variant. */ - struct st_tcp_variant_key key; + struct st_basic_variant_key key; void *driver_shader; - struct st_tcp_variant *next; + struct st_basic_variant *next; }; /** - * Derived from Mesa gl_tess_ctrl_program: + * Derived from Mesa gl_program: */ -struct st_tessctrl_program +struct st_common_program { - struct gl_tess_ctrl_program Base; /**< The Mesa tess ctrl program */ + struct gl_program Base; struct pipe_shader_state tgsi; struct glsl_to_tgsi_visitor* glsl_to_tgsi; + uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */ - struct st_tcp_variant *variants; -}; + /* used when bypassing glsl_to_tgsi: */ + struct gl_shader_program *shader_program; + struct st_basic_variant *variants; + /** SHA1 hash of linked tgsi shader program, used for on-disk cache */ + unsigned char sha1[20]; -/** Tessellation evaluation program variant key */ -struct st_tep_variant_key -{ - struct st_context *st; /**< variants are per-context */ - /* no other fields yet */ + /* Used by the shader cache and ARB_get_program_binary */ + unsigned num_tgsi_tokens; }; /** - * Tessellation evaluation program variant. + * Derived from Mesa gl_program: */ -struct st_tep_variant +struct st_compute_program { - /* Parameters which generated this variant. */ - struct st_tep_variant_key key; + struct gl_program Base; /**< The Mesa compute program */ + struct pipe_compute_state tgsi; + struct glsl_to_tgsi_visitor* glsl_to_tgsi; + uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */ - void *driver_shader; + /* used when bypassing glsl_to_tgsi: */ + struct gl_shader_program *shader_program; - struct st_tep_variant *next; -}; + struct st_basic_variant *variants; + /** SHA1 hash of linked tgsi shader program, used for on-disk cache */ + unsigned char sha1[20]; -/** - * Derived from Mesa gl_tess_eval_program: - */ -struct st_tesseval_program -{ - struct gl_tess_eval_program Base; /**< The Mesa tess eval program */ - struct pipe_shader_state tgsi; - struct glsl_to_tgsi_visitor* glsl_to_tgsi; - - struct st_tep_variant *variants; + /* Used by the shader cache and ARB_get_program_binary */ + unsigned num_tgsi_tokens; }; - static inline struct st_fragment_program * -st_fragment_program( struct gl_fragment_program *fp ) +st_fragment_program( struct gl_program *fp ) { return (struct st_fragment_program *)fp; } static inline struct st_vertex_program * -st_vertex_program( struct gl_vertex_program *vp ) +st_vertex_program( struct gl_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 struct st_tessctrl_program * -st_tessctrl_program( struct gl_tess_ctrl_program *tcp ) +static inline struct st_common_program * +st_common_program( struct gl_program *gp ) { - return (struct st_tessctrl_program *)tcp; + return (struct st_common_program *)gp; } -static inline struct st_tesseval_program * -st_tesseval_program( struct gl_tess_eval_program *tep ) +static inline struct st_compute_program * +st_compute_program( struct gl_program *cp ) { - return (struct st_tesseval_program *)tep; + return (struct st_compute_program *)cp; } static inline void @@ -321,16 +339,6 @@ 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, @@ -342,9 +350,9 @@ st_reference_fragprog(struct st_context *st, } static inline void -st_reference_tesscprog(struct st_context *st, - struct st_tessctrl_program **ptr, - struct st_tessctrl_program *prog) +st_reference_prog(struct st_context *st, + struct st_common_program **ptr, + struct st_common_program *prog) { _mesa_reference_program(st->ctx, (struct gl_program **) ptr, @@ -352,9 +360,9 @@ st_reference_tesscprog(struct st_context *st, } static inline void -st_reference_tesseprog(struct st_context *st, - struct st_tesseval_program **ptr, - struct st_tesseval_program *prog) +st_reference_compprog(struct st_context *st, + struct st_compute_program **ptr, + struct st_compute_program *prog) { _mesa_reference_program(st->ctx, (struct gl_program **) ptr, @@ -367,25 +375,12 @@ st_reference_tesseprog(struct st_context *st, static inline unsigned st_get_generic_varying_index(struct st_context *st, GLuint attr) { - if (attr >= VARYING_SLOT_VAR0) { - if (st->needs_texcoord_semantic) - return attr - VARYING_SLOT_VAR0; - else - return 9 + (attr - VARYING_SLOT_VAR0); - } - if (attr == VARYING_SLOT_PNTC) { - assert(!st->needs_texcoord_semantic); - return 8; - } - if (attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7) { - assert(!st->needs_texcoord_semantic); - return attr - VARYING_SLOT_TEX0; - } - - assert(0); - return 0; + return tgsi_get_generic_gl_varying_index((gl_varying_slot)attr, + st->needs_texcoord_semantic); } +extern void +st_set_prog_affected_state_flags(struct gl_program *prog); extern struct st_vp_variant * st_get_vp_variant(struct st_context *st, @@ -398,21 +393,15 @@ st_get_fp_variant(struct st_context *st, struct st_fragment_program *stfp, const struct st_fp_variant_key *key); +extern struct st_basic_variant * +st_get_cp_variant(struct st_context *st, + struct pipe_compute_state *tgsi, + struct st_basic_variant **variants); -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 struct st_tcp_variant * -st_get_tcp_variant(struct st_context *st, - struct st_tessctrl_program *stgp, - const struct st_tcp_variant_key *key); - -extern struct st_tep_variant * -st_get_tep_variant(struct st_context *st, - struct st_tesseval_program *stgp, - const struct st_tep_variant_key *key); +extern struct st_basic_variant * +st_get_basic_variant(struct st_context *st, + unsigned pipe_shader, + struct st_common_program *p); extern void st_release_vp_variants( struct st_context *st, @@ -423,16 +412,13 @@ 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); +st_release_cp_variants(struct st_context *st, + struct st_compute_program *stcp); extern void -st_release_tcp_variants(struct st_context *st, - struct st_tessctrl_program *stgp); - -extern void -st_release_tep_variants(struct st_context *st, - struct st_tesseval_program *stgp); +st_release_basic_variants(struct st_context *st, GLenum target, + struct st_basic_variant **variants, + struct pipe_shader_state *tgsi); extern void st_destroy_program_variants(struct st_context *st); @@ -447,15 +433,19 @@ st_translate_fragment_program(struct st_context *st, extern bool st_translate_geometry_program(struct st_context *st, - struct st_geometry_program *stgp); + struct st_common_program *stgp); extern bool st_translate_tessctrl_program(struct st_context *st, - struct st_tessctrl_program *sttcp); + struct st_common_program *sttcp); extern bool st_translate_tesseval_program(struct st_context *st, - struct st_tesseval_program *sttep); + struct st_common_program *sttep); + +extern bool +st_translate_compute_program(struct st_context *st, + struct st_compute_program *stcp); extern void st_print_current_vertex_program(void);