vkd3d: Hook up forced VRS 2x2 mode.

Signed-off-by: Hans-Kristian Arntzen <[email protected]>

include/vkd3d_shader.h

@@ -76,6 +76,7 @@ enum vkd3d_shader_meta_flags
     VKD3D_SHADER_META_FLAG_EMITS_TRIANGLES = 1 << 15,
     VKD3D_SHADER_META_FLAG_FORCE_COMPUTE_BARRIER_AFTER_DISPATCH = 1 << 16,
     VKD3D_SHADER_META_FLAG_EXPORTS_SAMPLE_MASK = 1 << 17,
+    VKD3D_SHADER_META_FLAG_FORCE_VRS_2X2 = 1 << 18,
 };
 
 struct vkd3d_shader_meta
@@ -429,6 +430,9 @@ enum vkd3d_shader_quirk
 
     /* Range check every descriptor heap access with dynamic index and robustness check it. */
     VKD3D_SHADER_QUIRK_DESCRIPTOR_HEAP_ROBUSTNESS = (1 << 15),
+
+    /* Compile pipeline with static 2x2 VRS factors. For speed hacks. */
+    VKD3D_SHADER_QUIRK_FORCE_VRS_2X2 = (1 << 16),
 };
 
 struct vkd3d_shader_quirk_hash

libs/vkd3d-shader/dxil.c

@@ -590,6 +590,8 @@ int vkd3d_shader_compile_dxil(const struct vkd3d_shader_code *dxbc,
     quirks = vkd3d_shader_compile_arguments_select_quirks(compiler_args, hash);
     if (quirks & VKD3D_SHADER_QUIRK_FORCE_COMPUTE_BARRIER)
         spirv->meta.flags |= VKD3D_SHADER_META_FLAG_FORCE_COMPUTE_BARRIER_AFTER_DISPATCH;
+    if (quirks & VKD3D_SHADER_QUIRK_FORCE_VRS_2X2)
+        spirv->meta.flags |= VKD3D_SHADER_META_FLAG_FORCE_VRS_2X2;
 
     dxil_spv_begin_thread_allocator_context();
 

libs/vkd3d-shader/spirv.c

@@ -11691,6 +11691,8 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler,
     vkd3d_shader_extract_feature_meta(spirv);
     if (compiler->quirks & VKD3D_SHADER_QUIRK_FORCE_COMPUTE_BARRIER)
         spirv->meta.flags |= VKD3D_SHADER_META_FLAG_FORCE_COMPUTE_BARRIER_AFTER_DISPATCH;
+    if (compiler->quirks & VKD3D_SHADER_QUIRK_FORCE_VRS_2X2)
+        spirv->meta.flags |= VKD3D_SHADER_META_FLAG_FORCE_VRS_2X2;
 
     return VKD3D_OK;
 }

libs/vkd3d/state.c

@@ -3942,10 +3942,12 @@ uint32_t d3d12_graphics_pipeline_state_get_dynamic_state_flags(struct d3d12_pipe
     if (d3d12_device_supports_variable_shading_rate_tier_1(state->device) && graphics->rt_count)
     {
         /* If sample rate shading or ROVs are used, force default VRS state. Do this by not enabling the dynamic state.
-         * This forces default static pipeline state to be used instead, which is what we want. */
+         * This forces default static pipeline state to be used instead, which is what we want.
+         * For force VRS 2x2, we want to remove the dynamic shading rate, and use static pipeline struct instead. */
         const uint32_t disable_flags =
                 VKD3D_SHADER_META_FLAG_USES_SAMPLE_RATE_SHADING |
-                VKD3D_SHADER_META_FLAG_USES_RASTERIZER_ORDERED_VIEWS;
+                VKD3D_SHADER_META_FLAG_USES_RASTERIZER_ORDERED_VIEWS |
+                VKD3D_SHADER_META_FLAG_FORCE_VRS_2X2;
         bool allow_vrs_combiners = true;
 
         for (i = 0; allow_vrs_combiners && i < graphics->stage_count; i++)
@@ -5275,12 +5277,26 @@ static void d3d12_pipeline_state_log_graphics_state(const struct d3d12_pipeline_
     ERR("Dynamic state: %#x (explicit: %#x)\n", graphics->pipeline_dynamic_states, graphics->explicit_dynamic_states);
 }
 
+static bool d3d12_pipeline_state_forces_vrs_2x2(struct d3d12_pipeline_state *state)
+{
+    struct d3d12_graphics_pipeline_state *graphics = &state->graphics;
+    bool use_vrs_2x2 = false;
+    uint32_t i;
+
+    if (d3d12_device_supports_variable_shading_rate_tier_1(state->device) && graphics->rt_count)
+        for (i = 0; i < graphics->stage_count && !use_vrs_2x2; i++)
+            use_vrs_2x2 = !!(graphics->code[i].meta.flags & VKD3D_SHADER_META_FLAG_FORCE_VRS_2X2);
+
+    return use_vrs_2x2;
+}
+
 static VkResult d3d12_pipeline_state_link_pipeline_variant(struct d3d12_pipeline_state *state,
         const struct vkd3d_pipeline_key *key, const struct vkd3d_format *dsv_format, VkPipelineCache vk_cache,
         uint32_t dynamic_state_flags, VkPipeline *vk_pipeline)
 {
     const struct vkd3d_vk_device_procs *vk_procs = &state->device->vk_procs;
     struct d3d12_graphics_pipeline_state *graphics = &state->graphics;
+    VkPipelineFragmentShadingRateStateCreateInfoKHR shading_rate_info;
     struct vkd3d_fragment_output_pipeline_desc fragment_output_desc;
     struct vkd3d_vertex_input_pipeline_desc vertex_input_desc;
     VkPipelineLibraryCreateInfoKHR library_info;
@@ -5315,6 +5331,18 @@ static VkResult d3d12_pipeline_state_link_pipeline_variant(struct d3d12_pipeline
     create_info.layout = graphics->pipeline_layout;
     create_info.basePipelineIndex = -1;
 
+    if (d3d12_pipeline_state_forces_vrs_2x2(state))
+    {
+        memset(&shading_rate_info, 0, sizeof(shading_rate_info));
+        shading_rate_info.sType = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR;
+        shading_rate_info.combinerOps[0] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR;
+        shading_rate_info.combinerOps[1] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR;
+        shading_rate_info.fragmentSize.width = 2;
+        shading_rate_info.fragmentSize.height = 2;
+
+        vk_prepend_struct(&create_info, &shading_rate_info);
+    }
+
     if (d3d12_device_uses_descriptor_buffers(state->device))
         create_info.flags |= VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT;
 
@@ -5344,6 +5372,7 @@ VkPipeline d3d12_pipeline_state_create_pipeline_variant(struct d3d12_pipeline_st
 {
     const struct vkd3d_vk_device_procs *vk_procs = &state->device->vk_procs;
     VkDynamicState dynamic_state_buffer[ARRAY_SIZE(vkd3d_dynamic_state_list)];
+    VkPipelineFragmentShadingRateStateCreateInfoKHR shading_rate_info;
     struct d3d12_graphics_pipeline_state *graphics = &state->graphics;
     VkPipelineCreationFeedbackEXT feedbacks[VKD3D_MAX_SHADER_STAGES];
     struct vkd3d_fragment_output_pipeline_desc fragment_output_desc;
@@ -5512,6 +5541,18 @@ VkPipeline d3d12_pipeline_state_create_pipeline_variant(struct d3d12_pipeline_st
     else
         feedback_info.pipelineStageCreationFeedbackCount = 0;
 
+    if (d3d12_pipeline_state_forces_vrs_2x2(state))
+    {
+        memset(&shading_rate_info, 0, sizeof(shading_rate_info));
+        shading_rate_info.sType = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR;
+        shading_rate_info.combinerOps[0] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR;
+        shading_rate_info.combinerOps[1] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR;
+        shading_rate_info.fragmentSize.width = 2;
+        shading_rate_info.fragmentSize.height = 2;
+
+        vk_prepend_struct(&pipeline_desc, &shading_rate_info);
+    }
+
     vr = VK_CALL(vkCreateGraphicsPipelines(device->vk_device, vk_cache, 1, &pipeline_desc, NULL, &vk_pipeline));
 
     if (vkd3d_config_flags & VKD3D_CONFIG_FLAG_PIPELINE_LIBRARY_LOG)