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

iris: last VUE map NOS, handle > 16 FS inputs

Browse Source 
not sure if the UNCOMPILED_FS flagging is still needed, should
reevaluate those hacks at some point
This commit is contained in:
Kenneth Graunke
2018-08-15 13:35:05 -07:00
parent ee8cb7e0ee
commit 2bd7d6fa71
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,6 +120,12 @@ iris_create_shader_state(struct pipe_context *ctx,
IRIS_NOS_DEPTH_STENCIL_ALPHA |
IRIS_NOS_RASTERIZER |
IRIS_NOS_BLEND;
/* The program key needs the VUE map if there are > 16 inputs */
if (util_bitcount64(ish->nir->info.inputs_read &
BRW_FS_VARYING_INPUT_MASK) > 16) {
ish->nos |= IRIS_NOS_LAST_VUE_MAP;
}
break;
case MESA_SHADER_COMPUTE:
// XXX: NOS
@@ -742,6 +748,9 @@ iris_update_compiled_fs(struct iris_context *ice)
struct brw_wm_prog_key key = { .program_string_id = ish->program_id };
ice->vtbl.populate_fs_key(ice, &key);
if (ish->nos & IRIS_NOS_LAST_VUE_MAP)
key.input_slots_valid = ice->shaders.last_vue_map->slots_valid;
if (iris_bind_cached_shader(ice, IRIS_CACHE_FS, &key))
return;
@@ -789,7 +798,8 @@ update_last_vue_map(struct iris_context *ice,
ice->state.dirty |= IRIS_DIRTY_CLIP |
IRIS_DIRTY_SF_CL_VIEWPORT |
IRIS_DIRTY_SCISSOR_RECT |
IRIS_DIRTY_UNCOMPILED_FS;
IRIS_DIRTY_UNCOMPILED_FS |
ice->state.dirty_for_nos[IRIS_NOS_LAST_VUE_MAP];
// XXX: CC_VIEWPORT?
}