diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 438e6a85fb0..0f60386173e 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -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;
 }
 
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index debc02a4116..a1457edf320 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -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;
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index 3195c35be14..e6842b1a473 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -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;