fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: hash keep_executable_info into shader key rather than device cache key

Browse source 
for consistency.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37525>
This commit is contained in:
Daniel Schürmann 2025-10-07 10:31:12 +02:00 • committed by Marge Bot
parent 5ef8930636
commit 6c2d614412
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/amd/vulkan/radv_device.c
View file

@ -872,7 +872,6 @@ radv_device_init_cache_key(struct radv_device *device)
struct radv_device_cache_key *key = &device->cache_key;
struct mesa_blake3 ctx;
key->keep_shader_info = device->keep_shader_info;
key->image_2d_view_of_3d = device->vk.enabled_features.image2DViewOf3D && pdev->info.gfx_level == GFX9;
key->mesh_shader_queries = device->vk.enabled_features.meshShaderQueries && pdev->emulate_mesh_shader_queries;
key->primitives_generated_query = radv_uses_primitives_generated_query(device);

3
src/amd/vulkan/radv_device.h
View file

@ -57,12 +57,11 @@ struct radv_layer_dispatch_tables {
};
struct radv_device_cache_key {
uint32_t keep_shader_info : 1;
uint32_t image_2d_view_of_3d : 1;
uint32_t mesh_shader_queries : 1;
uint32_t primitives_generated_query : 1;
uint32_t reserved : 28;
uint32_t reserved : 29;
};
enum radv_force_vrs {

1
src/amd/vulkan/radv_pipeline.c
View file

@ -134,6 +134,7 @@ radv_pipeline_get_shader_key(const struct radv_device *device, const VkPipelineS
struct radv_shader_stage_key key = {0};
key.keep_statistic_info = radv_pipeline_capture_shader_stats(device, flags);
key.keep_executable_info = radv_pipeline_capture_shaders(device, flags);
if (flags & VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT)
key.optimisations_disabled = 1;

3
src/amd/vulkan/radv_shader.h
View file

@ -78,6 +78,7 @@ struct radv_shader_stage_key {
uint8_t optimisations_disabled : 1;
uint8_t keep_statistic_info : 1;
uint8_t keep_executable_info : 1;
uint8_t view_index_from_device_index : 1;
/* Shader version (up to 8) to force re-compilation when RADV_BUILD_ID_OVERRIDE is enabled. */
@ -89,7 +90,7 @@ struct radv_shader_stage_key {
/* Whether the shader is used with indirect pipeline binds. */
uint8_t indirect_bindable : 1;
uint32_t reserved : 18;
uint32_t reserved : 17;
};
struct radv_ps_epilog_key {