diff options
| author | Samuel Pitoiset <[email protected]> | 2019-09-18 16:58:06 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2019-09-18 21:19:28 +0200 |
| commit | 99c186fbbe3e2da0f176eadb1db0a8a640786384 (patch) | |
| tree | 9937d9fe6523326838dd38d614a9080d7542cbf6 /src/amd | |
| parent | fe7aa271a994e88cb3c1f4a6ad26f581ef8098c0 (diff) | |
radv/gfx10: fix VK_KHR_pipeline_executable_properties with NGG GS
No GS copy shader if a pipeline enables NGG GS.
This fixes
dEQP-VK.pipeline.executable_properties.graphics.*geometry_stage*.
Fixes: 86864eedd2d ("radv: Implement radv_GetPipelineExecutablePropertiesKHR.")
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 947c0694a87..a6aad38eafe 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -4923,8 +4923,15 @@ static uint32_t radv_get_executable_count(const struct radv_pipeline *pipeline) { uint32_t ret = 0; for (int i = 0; i < MESA_SHADER_STAGES; ++i) { - if (pipeline->shaders[i]) - ret += i == MESA_SHADER_GEOMETRY ? 2u : 1u; + if (!pipeline->shaders[i]) + continue; + + if (i == MESA_SHADER_GEOMETRY && + !radv_pipeline_has_ngg(pipeline)) { + ret += 2u; + } else { + ret += 1u; + } } return ret; @@ -4943,7 +4950,8 @@ radv_get_shader_from_executable_index(const struct radv_pipeline *pipeline, int --index; - if (i == MESA_SHADER_GEOMETRY) { + if (i == MESA_SHADER_GEOMETRY && + !radv_pipeline_has_ngg(pipeline)) { if (!index) { *stage = i; return pipeline->gs_copy_shader; @@ -5034,7 +5042,8 @@ VkResult radv_GetPipelineExecutablePropertiesKHR( desc_copy(pProperties[executable_idx].description, description); ++executable_idx; - if (i == MESA_SHADER_GEOMETRY) { + if (i == MESA_SHADER_GEOMETRY && + !radv_pipeline_has_ngg(pipeline)) { assert(pipeline->gs_copy_shader); if (executable_idx >= count) break; |