X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_program.h;h=7483450eae5e4f9ae791488ff6bc5ea71ff7bef9;hb=5f1a16d06d8b2cf6942b1e4b250842ec0be2c8a4;hp=c2df2463273670f95cf2134d115a7c59bce0b09b;hpb=60398e2d45f602fb3bf3a6cf770f4e26eee50587;p=mesa.git diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index c2df2463273..7483450eae5 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -71,9 +71,15 @@ st_get_external_sampler_key(struct st_context *st, struct gl_program *prog) unsigned unit = u_bit_scan(&mask); struct st_texture_object *stObj = st_get_texture_object(st->ctx, prog, unit); + enum pipe_format format = st_get_view_format(stObj); - switch (st_get_view_format(stObj)) { + /* if resource format matches then YUV wasn't lowered */ + if (format == stObj->pt->format) + continue; + + switch (format) { case PIPE_FORMAT_NV12: + case PIPE_FORMAT_P010: case PIPE_FORMAT_P016: key.lower_nv12 |= (1 << unit); break; @@ -94,7 +100,7 @@ st_get_external_sampler_key(struct st_context *st, struct gl_program *prog) break; default: printf("mesa: st_get_external_sampler_key: unhandled pipe format %u\n", - st_get_view_format(stObj)); + format); break; } } @@ -131,7 +137,7 @@ struct st_fp_variant_key GLuint lower_two_sided_color:1; GLuint lower_flatshade:1; - enum compare_func lower_alpha_func:3; + unsigned lower_alpha_func:3; /** needed for ATI_fragment_shader */ char texture_targets[MAX_NUM_FRAGMENT_REGISTERS_ATI]; @@ -139,27 +145,36 @@ struct st_fp_variant_key struct st_external_sampler_key external; }; +/** + * Base class for shader variants. + */ +struct st_variant +{ + /** next in linked list */ + struct st_variant *next; + + /** st_context from the shader key */ + struct st_context *st; + + void *driver_shader; +}; /** * Variant of a fragment program. */ struct st_fp_variant { + struct st_variant base; + /** Parameters which generated this version of fragment program */ struct st_fp_variant_key key; - /** Driver's compiled shader */ - void *driver_shader; - /** For glBitmap variants */ uint bitmap_sampler; /** For glDrawPixels variants */ unsigned drawpix_sampler; unsigned pixelmap_sampler; - - /** next in linked list */ - struct st_fp_variant *next; }; @@ -181,39 +196,27 @@ struct st_common_variant_key /* for user-defined clip-planes */ uint8_t lower_ucp; + + /* Whether st_variant::driver_shader is for the draw module, + * not for the driver. + */ + bool is_draw_shader; }; /** - * This represents a vertex program, especially translated to match - * the inputs of a particular fragment shader. + * Common shader variant. */ -struct st_vp_variant +struct st_common_variant { - /* Parameters which generated this translated version of a vertex - * shader: - */ + struct st_variant base; + + /* Parameters which generated this variant. */ struct st_common_variant_key key; - /** - * The shader variant saved for the draw module to later emulate - * selection/feedback/rasterpos. + /* Bitfield of VERT_BIT_* bits matching vertex shader inputs, + * but not include the high part of doubles. */ - const struct tgsi_token *tokens; - - /** 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; - - /** Bitfield of VERT_BIT_* bits of mesa vertex processing inputs */ GLbitfield vert_attrib_mask; }; @@ -221,16 +224,28 @@ struct st_vp_variant /** * Derived from Mesa gl_program: */ -struct st_vertex_program +struct st_program { - struct gl_program Base; /**< The Mesa vertex program */ + struct gl_program Base; struct pipe_shader_state state; 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 */ + void *serialized_nir; + unsigned serialized_nir_size; + /* used when bypassing glsl_to_tgsi: */ struct gl_shader_program *shader_program; + struct st_variant *variants; +}; + + +struct st_vertex_program +{ + struct st_program Base; + /** maps a TGSI input index back to a Mesa VERT_ATTRIB_x */ ubyte index_to_input[PIPE_MAX_ATTRIBS]; ubyte num_inputs; @@ -239,78 +254,35 @@ struct st_vertex_program /** Maps VARYING_SLOT_x to slot */ ubyte result_to_output[VARYING_SLOT_MAX]; - - /** List of translated variants of this vertex program. - */ - struct st_vp_variant *variants; }; -/** - * Geometry program variant. - */ -struct st_common_variant +static inline struct st_program * +st_program( struct gl_program *cp ) { - /* Parameters which generated this variant. */ - struct st_common_variant_key key; - - void *driver_shader; - - struct st_common_variant *next; -}; - - -/** - * Derived from Mesa gl_program: - */ -struct st_common_program -{ - struct gl_program Base; - struct pipe_shader_state state; - 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; - - union { - struct st_common_variant *variants; - struct st_fp_variant *fp_variants; - }; -}; - - -static inline struct st_vertex_program * -st_vertex_program( struct gl_program *vp ) -{ - return (struct st_vertex_program *)vp; -} - -static inline struct st_common_program * -st_common_program( struct gl_program *cp ) -{ - return (struct st_common_program *)cp; + return (struct st_program *)cp; } static inline void -st_reference_vertprog(struct st_context *st, - struct st_vertex_program **ptr, - struct st_vertex_program *prog) +st_reference_prog(struct st_context *st, + struct st_program **ptr, + struct st_program *prog) { _mesa_reference_program(st->ctx, (struct gl_program **) ptr, (struct gl_program *) prog); } -static inline void -st_reference_prog(struct st_context *st, - struct st_common_program **ptr, - struct st_common_program *prog) +static inline struct st_common_variant * +st_common_variant(struct st_variant *v) { - _mesa_reference_program(st->ctx, - (struct gl_program **) ptr, - (struct gl_program *) prog); + return (struct st_common_variant*)v; +} + +static inline struct st_fp_variant * +st_fp_variant(struct st_variant *v) +{ + return (struct st_fp_variant*)v; } /** @@ -326,32 +298,27 @@ st_get_generic_varying_index(struct st_context *st, GLuint attr) extern void st_set_prog_affected_state_flags(struct gl_program *prog); -extern struct st_vp_variant * +extern struct st_common_variant * st_get_vp_variant(struct st_context *st, - struct st_vertex_program *stvp, + struct st_program *stvp, const struct st_common_variant_key *key); extern struct st_fp_variant * st_get_fp_variant(struct st_context *st, - struct st_common_program *stfp, + struct st_program *stfp, const struct st_fp_variant_key *key); -extern struct st_common_variant * +extern struct st_variant * st_get_common_variant(struct st_context *st, - struct st_common_program *p, + struct st_program *p, const struct st_common_variant_key *key); extern void -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_common_program *stfp ); +st_release_variants(struct st_context *st, struct st_program *p); extern void -st_release_common_variants(struct st_context *st, struct st_common_program *p); +st_release_program(struct st_context *st, struct st_program **p); extern void st_destroy_program_variants(struct st_context *st); @@ -360,22 +327,25 @@ extern void st_finalize_nir_before_variants(struct nir_shader *nir); extern void -st_prepare_vertex_program(struct st_vertex_program *stvp); +st_prepare_vertex_program(struct st_program *stvp); extern void st_translate_stream_output_info(struct gl_program *prog); extern bool st_translate_vertex_program(struct st_context *st, - struct st_vertex_program *stvp); + struct st_program *stvp); extern bool st_translate_fragment_program(struct st_context *st, - struct st_common_program *stfp); + struct st_program *stfp); extern bool st_translate_common_program(struct st_context *st, - struct st_common_program *stcp); + struct st_program *stp); + +extern void +st_serialize_nir(struct st_program *stp); extern void st_finalize_program(struct st_context *st, struct gl_program *prog);