KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/mesa: rename basic -> common for st_common_program 

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Marek Olšák 2019-10-16 16:05:10 -04:00
parent 33d53f0614
commit 64dfc82340
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/state_tracker/st_atom_shader.c
View File

@ -257,7 +257,7 @@ st_update_common_program(struct st_context *st, struct gl_program *prog,
if (st->shader_has_one_variant[prog->info.stage] && stp->variants) if (st->shader_has_one_variant[prog->info.stage] && stp->variants)
return stp->variants->driver_shader; return stp->variants->driver_shader;
struct st_basic_variant_key key; struct st_common_variant_key key;
/* use memset, not an initializer to be sure all memory is zeroed */ /* use memset, not an initializer to be sure all memory is zeroed */
memset(&key, 0, sizeof(key)); memset(&key, 0, sizeof(key));
@ -286,7 +286,7 @@ st_update_common_program(struct st_context *st, struct gl_program *prog,
} }
return st_get_basic_variant(st, stp, &key)->driver_shader; return st_get_common_variant(st, stp, &key)->driver_shader;
} }

4
src/mesa/state_tracker/st_cb_program.c
View File

@ -109,7 +109,7 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
{ {
struct st_common_program *p = st_common_program(prog); struct st_common_program *p = st_common_program(prog);
st_release_basic_variants(st, p); st_release_common_variants(st, p);
if (p->glsl_to_tgsi) if (p->glsl_to_tgsi)
free_glsl_to_tgsi_visitor(p->glsl_to_tgsi); free_glsl_to_tgsi_visitor(p->glsl_to_tgsi);
@ -179,7 +179,7 @@ st_program_string_notify( struct gl_context *ctx,
} else { } else {
struct st_common_program *stcp = st_common_program(prog); struct st_common_program *stcp = st_common_program(prog);
st_release_basic_variants(st, stcp); st_release_common_variants(st, stcp);
if (!stcp->shader_program && /* not GLSL->NIR */ if (!stcp->shader_program && /* not GLSL->NIR */
!st_translate_common_program(st, stcp)) !st_translate_common_program(st, stcp))
return false; return false;

28
src/mesa/state_tracker/st_program.c
View File

@ -318,7 +318,7 @@ st_release_fp_variants(struct st_context *st, struct st_fragment_program *stfp)
* the variant from the linked list. * the variant from the linked list.
*/ */
static void static void
delete_basic_variant(struct st_context *st, struct st_basic_variant *v, delete_basic_variant(struct st_context *st, struct st_common_variant *v,
GLenum target) GLenum target)
{ {
if (v->driver_shader) { if (v->driver_shader) {
@ -372,12 +372,12 @@ delete_basic_variant(struct st_context *st, struct st_basic_variant *v,
* Free all basic program variants. * Free all basic program variants.
*/ */
void void
st_release_basic_variants(struct st_context *st, struct st_common_program *p) st_release_common_variants(struct st_context *st, struct st_common_program *p)
{ {
struct st_basic_variant *v; struct st_common_variant *v;
for (v = p->variants; v; ) { for (v = p->variants; v; ) {
struct st_basic_variant *next = v->next; struct st_common_variant *next = v->next;
delete_basic_variant(st, v, p->Base.Target); delete_basic_variant(st, v, p->Base.Target);
v = next; v = next;
} }
@ -1677,13 +1677,13 @@ st_translate_common_program(struct st_context *st,
/** /**
* Get/create a basic program variant. * Get/create a basic program variant.
*/ */
struct st_basic_variant * struct st_common_variant *
st_get_basic_variant(struct st_context *st, st_get_common_variant(struct st_context *st,
struct st_common_program *prog, struct st_common_program *prog,
const struct st_basic_variant_key *key) const struct st_common_variant_key *key)
{ {
struct pipe_context *pipe = st->pipe; struct pipe_context *pipe = st->pipe;
struct st_basic_variant *v; struct st_common_variant *v;
struct pipe_shader_state tgsi = {0}; struct pipe_shader_state tgsi = {0};
/* Search for existing variant */ /* Search for existing variant */
@ -1695,7 +1695,7 @@ st_get_basic_variant(struct st_context *st,
if (!v) { if (!v) {
/* create new */ /* create new */
v = CALLOC_STRUCT(st_basic_variant); v = CALLOC_STRUCT(st_common_variant);
if (v) { if (v) {
if (prog->state.type == PIPE_SHADER_IR_NIR) { if (prog->state.type == PIPE_SHADER_IR_NIR) {
@ -1830,10 +1830,10 @@ destroy_program_variants(struct st_context *st, struct gl_program *target)
case GL_COMPUTE_PROGRAM_NV: case GL_COMPUTE_PROGRAM_NV:
{ {
struct st_common_program *p = st_common_program(target); struct st_common_program *p = st_common_program(target);
struct st_basic_variant *v, **prevPtr = &p->variants; struct st_common_variant *v, **prevPtr = &p->variants;
for (v = p->variants; v; ) { for (v = p->variants; v; ) {
struct st_basic_variant *next = v->next; struct st_common_variant *next = v->next;
if (v->key.st == st) { if (v->key.st == st) {
/* unlink from list */ /* unlink from list */
*prevPtr = next; *prevPtr = next;
@ -1984,12 +1984,12 @@ st_precompile_shader_variant(struct st_context *st,
case GL_GEOMETRY_PROGRAM_NV: case GL_GEOMETRY_PROGRAM_NV:
case GL_COMPUTE_PROGRAM_NV: { case GL_COMPUTE_PROGRAM_NV: {
struct st_common_program *p = st_common_program(prog); struct st_common_program *p = st_common_program(prog);
struct st_basic_variant_key key; struct st_common_variant_key key;
memset(&key, 0, sizeof(key)); memset(&key, 0, sizeof(key));
key.st = st->has_shareable_shaders ? NULL : st; key.st = st->has_shareable_shaders ? NULL : st;
st_get_basic_variant(st, p, &key); st_get_common_variant(st, p, &key);
break; break;
} }

22
src/mesa/state_tracker/st_program.h
View File

@ -274,8 +274,8 @@ struct st_vertex_program
/** Key shared by all shaders except VP, FP */ /** Shader key shared by other shaders */
struct st_basic_variant_key struct st_common_variant_key
{ {
struct st_context *st; /**< variants are per-context */ struct st_context *st; /**< variants are per-context */
@ -292,14 +292,14 @@ struct st_basic_variant_key
/** /**
* Geometry program variant. * Geometry program variant.
*/ */
struct st_basic_variant struct st_common_variant
{ {
/* Parameters which generated this variant. */ /* Parameters which generated this variant. */
struct st_basic_variant_key key; struct st_common_variant_key key;
void *driver_shader; void *driver_shader;
struct st_basic_variant *next; struct st_common_variant *next;
}; };
@ -316,7 +316,7 @@ struct st_common_program
/* used when bypassing glsl_to_tgsi: */ /* used when bypassing glsl_to_tgsi: */
struct gl_shader_program *shader_program; struct gl_shader_program *shader_program;
struct st_basic_variant *variants; struct st_common_variant *variants;
/** SHA1 hash of linked tgsi shader program, used for on-disk cache */ /** SHA1 hash of linked tgsi shader program, used for on-disk cache */
unsigned char sha1[20]; unsigned char sha1[20];
@ -409,10 +409,10 @@ st_get_fp_variant(struct st_context *st,
struct st_fragment_program *stfp, struct st_fragment_program *stfp,
const struct st_fp_variant_key *key); const struct st_fp_variant_key *key);
extern struct st_basic_variant * extern struct st_common_variant *
st_get_basic_variant(struct st_context *st, st_get_common_variant(struct st_context *st,
struct st_common_program *p, struct st_common_program *p,
const struct st_basic_variant_key *key); const struct st_common_variant_key *key);
extern void extern void
st_release_vp_variants( struct st_context *st, st_release_vp_variants( struct st_context *st,
@ -423,7 +423,7 @@ st_release_fp_variants( struct st_context *st,
struct st_fragment_program *stfp ); struct st_fragment_program *stfp );
extern void extern void
st_release_basic_variants(struct st_context *st, struct st_common_program *p); st_release_common_variants(struct st_context *st, struct st_common_program *p);
extern void extern void
st_destroy_program_variants(struct st_context *st); st_destroy_program_variants(struct st_context *st);

2
src/mesa/state_tracker/st_shader_cache.c
View File

@ -233,7 +233,7 @@ st_deserialise_ir_program(struct gl_context *ctx,
case MESA_SHADER_COMPUTE: { case MESA_SHADER_COMPUTE: {
struct st_common_program *stcp = st_common_program(prog); struct st_common_program *stcp = st_common_program(prog);
st_release_basic_variants(st, stcp); st_release_common_variants(st, stcp);
if (prog->info.stage == MESA_SHADER_TESS_EVAL || if (prog->info.stage == MESA_SHADER_TESS_EVAL ||
prog->info.stage == MESA_SHADER_GEOMETRY) prog->info.stage == MESA_SHADER_GEOMETRY)