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

radv: include disable_aniso_single_level and adjust_frag_coord_z in key

Browse Source 
Fixes potential pipeline caching bug.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15175>
This commit is contained in:
Rhys Perry
2022-02-25 14:54:22 +00:00
committed by Marge Bot
parent 2de15273d5
commit feb7e30e2d
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_pipeline.c
+6
View File
@@ -3007,6 +3007,9 @@ radv_generate_graphics_pipeline_key(const struct radv_pipeline *pipeline,
key.invariant_geom = true;
key.use_ngg = pipeline->device->physical_device->use_ngg;
key.adjust_frag_coord_z = pipeline->device->adjust_frag_coord_z;
key.disable_aniso_single_level = pipeline->device->instance->disable_aniso_single_level &&
pipeline->device->physical_device->rad_info.chip_class < GFX8;
return key;
}
@@ -6397,6 +6400,9 @@ radv_generate_compute_pipeline_key(struct radv_pipeline *pipeline,
key.cs.require_full_subgroups = true;
}
key.disable_aniso_single_level = pipeline->device->instance->disable_aniso_single_level &&
pipeline->device->physical_device->rad_info.chip_class < GFX8;
return key;
}
src/amd/vulkan/radv_shader.c
+2 -2
View File
@@ -1925,8 +1925,8 @@ shader_compile(struct radv_device *device, struct vk_shader_module *module,
options->has_ls_vgpr_init_bug = device->physical_device->rad_info.has_ls_vgpr_init_bug;
options->enable_mrt_output_nan_fixup =
module && !is_meta_shader(module->nir) && options->key.ps.enable_mrt_output_nan_fixup;
options->adjust_frag_coord_z = device->adjust_frag_coord_z;
options->disable_aniso_single_level = device->instance->disable_aniso_single_level;
options->adjust_frag_coord_z = options->key.adjust_frag_coord_z;
options->disable_aniso_single_level = options->key.disable_aniso_single_level;
options->has_image_load_dcc_bug = device->physical_device->rad_info.has_image_load_dcc_bug;
options->debug.func = radv_compiler_debug;
options->debug.private_data = &debug_data;
src/amd/vulkan/radv_shader.h
+2
View File
@@ -60,6 +60,8 @@ struct radv_pipeline_key {
uint32_t optimisations_disabled : 1;
uint32_t invariant_geom : 1;
uint32_t use_ngg : 1;
uint32_t adjust_frag_coord_z : 1;
uint32_t disable_aniso_single_level : 1;
struct {
uint32_t instance_rate_inputs;