From 83b2f1d8cf53ec7f9defa2acdae313cdacb303af Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Tue, 21 Apr 2020 12:19:56 -0400 Subject: [PATCH] turnip: set shader key msaa field Fixes per-sample interpolation. Signed-off-by: Jonathan Marek Part-of: --- src/freedreno/vulkan/tu_shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c index 85bf6bbc50f..aa07f5df066 100644 --- a/src/freedreno/vulkan/tu_shader.c +++ b/src/freedreno/vulkan/tu_shader.c @@ -596,6 +596,7 @@ tu_shader_compile_options_init( const VkGraphicsPipelineCreateInfo *pipeline_info) { bool has_gs = false; + bool msaa = false; if (pipeline_info) { for (uint32_t i = 0; i < pipeline_info->stageCount; i++) { if (pipeline_info->pStages[i].stage == VK_SHADER_STAGE_GEOMETRY_BIT) { @@ -603,12 +604,17 @@ tu_shader_compile_options_init( break; } } + + if (!pipeline_info->pRasterizationState->rasterizerDiscardEnable && + pipeline_info->pMultisampleState->rasterizationSamples > 1) + msaa = true; } *options = (struct tu_shader_compile_options) { /* TODO: Populate the remaining fields of ir3_shader_key. */ .key = { .has_gs = has_gs, + .msaa = msaa, }, /* TODO: VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT * some optimizations need to happen otherwise shader might not compile -- 2.30.2