OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Only set key->flat_shade if COL0/COL1 are written.

Browse Source 
This was just laziness on my part, we already added similar checks in
the VS key handling.  Just need to do it here too.  Should improve cache
hits.
This commit is contained in:
Kenneth Graunke
2019-07-07 16:32:09 -07:00
parent cb82d534a0
commit c58f52f0ef
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/iris/iris_context.h
View File

@@ -475,6 +475,7 @@ struct iris_vtable {
void (*populate_gs_key)(const struct iris_context *ice, void (*populate_gs_key)(const struct iris_context *ice,
struct brw_gs_prog_key *key); struct brw_gs_prog_key *key);
void (*populate_fs_key)(const struct iris_context *ice, void (*populate_fs_key)(const struct iris_context *ice,
const struct shader_info *info,
struct brw_wm_prog_key *key); struct brw_wm_prog_key *key);
void (*populate_cs_key)(const struct iris_context *ice, void (*populate_cs_key)(const struct iris_context *ice,
struct brw_cs_prog_key *key); struct brw_cs_prog_key *key);

2
src/gallium/drivers/iris/iris_program.c
View File

@@ -1494,7 +1494,7 @@ iris_update_compiled_fs(struct iris_context *ice)
struct iris_screen *screen = (struct iris_screen *)ice->ctx.screen; struct iris_screen *screen = (struct iris_screen *)ice->ctx.screen;
const struct gen_device_info *devinfo = &screen->devinfo; const struct gen_device_info *devinfo = &screen->devinfo;
struct brw_wm_prog_key key = { KEY_INIT(devinfo->gen) }; struct brw_wm_prog_key key = { KEY_INIT(devinfo->gen) };
ice->vtbl.populate_fs_key(ice, &key); ice->vtbl.populate_fs_key(ice, &ish->nir->info, &key);
if (ish->nos & (1ull << IRIS_NOS_LAST_VUE_MAP)) if (ish->nos & (1ull << IRIS_NOS_LAST_VUE_MAP))
key.input_slots_valid = ice->shaders.last_vue_map->slots_valid; key.input_slots_valid = ice->shaders.last_vue_map->slots_valid;

5
src/gallium/drivers/iris/iris_state.c
View File

@@ -3442,6 +3442,7 @@ iris_populate_gs_key(const struct iris_context *ice,
*/ */
static void static void
iris_populate_fs_key(const struct iris_context *ice, iris_populate_fs_key(const struct iris_context *ice,
const struct shader_info *info,
struct brw_wm_prog_key *key) struct brw_wm_prog_key *key)
{ {
struct iris_screen *screen = (void *) ice->ctx.screen; struct iris_screen *screen = (void *) ice->ctx.screen;
@@ -3458,8 +3459,8 @@ iris_populate_fs_key(const struct iris_context *ice,
key->alpha_test_replicate_alpha = fb->nr_cbufs > 1 && zsa->alpha.enabled; key->alpha_test_replicate_alpha = fb->nr_cbufs > 1 && zsa->alpha.enabled;
/* XXX: only bother if COL0/1 are read */ key->flat_shade = rast->flatshade &&
key->flat_shade = rast->flatshade; (info->inputs_read & (VARYING_BIT_COL0 | VARYING_BIT_COL1));
key->persample_interp = rast->force_persample_interp; key->persample_interp = rast->force_persample_interp;
key->multisample_fbo = rast->multisample && fb->samples > 1; key->multisample_fbo = rast->multisample && fb->samples > 1;