X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_program.h;h=87ac3388d7276c81a6498763190d906b8e46caa7;hb=a398a9d7e7f8fe19eaa0c33b36ab6816472b698c;hp=9ad23235bcb4741b63e43a4da65923f8a97cf907;hpb=4e70cba638b98ee2e3952d30ac767ce9f325656c;p=mesa.git diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index 9ad23235bcb..87ac3388d72 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; } } @@ -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,54 +196,28 @@ struct st_common_variant_key /* for user-defined clip-planes */ uint8_t lower_ucp; -}; - - -/** - * 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 st_common_variant_key key; - /** - * The shader variant saved for the draw module to later emulate - * selection/feedback/rasterpos. + /* Whether st_variant::driver_shader is for the draw module, + * not for the driver. */ - 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; + bool is_draw_shader; }; /** - * Geometry program variant. + * Common shader variant. */ struct st_common_variant { + struct st_variant base; + /* Parameters which generated this variant. */ struct st_common_variant_key key; - void *driver_shader; - - struct st_common_variant *next; + /* Bitfield of VERT_BIT_* bits matching vertex shader inputs, + * but not include the high part of doubles. + */ + GLbitfield vert_attrib_mask; }; @@ -243,14 +232,13 @@ struct st_program struct ati_fragment_shader *ati_fs; uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */ - /* used when bypassing glsl_to_tgsi: */ + void *serialized_nir; + unsigned serialized_nir_size; + + /* used when bypassing glsl_to_tgsi: */ struct gl_shader_program *shader_program; - union { - struct st_common_variant *variants; - struct st_vp_variant *vp_variants; - struct st_fp_variant *fp_variants; - }; + struct st_variant *variants; }; @@ -285,6 +273,18 @@ st_reference_prog(struct st_context *st, (struct gl_program *) prog); } +static inline struct st_common_variant * +st_common_variant(struct st_variant *v) +{ + 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; +} + /** * This defines mapping from Mesa VARYING_SLOTs to TGSI GENERIC slots. */ @@ -298,7 +298,7 @@ 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_program *stvp, const struct st_common_variant_key *key); @@ -309,21 +309,13 @@ st_get_fp_variant(struct st_context *st, 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_program *p, const struct st_common_variant_key *key); extern void -st_release_vp_variants( struct st_context *st, - struct st_program *stvp ); - -extern void -st_release_fp_variants( struct st_context *st, - struct st_program *stfp ); - -extern void -st_release_common_variants(struct st_context *st, struct st_program *p); +st_release_variants(struct st_context *st, struct st_program *p); extern void st_destroy_program_variants(struct st_context *st); @@ -349,6 +341,9 @@ extern bool st_translate_common_program(struct st_context *st, 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);