diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2018-06-02 14:25:45 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2018-06-04 13:46:24 +0200 |
| commit | 2835b6baf446d0ff3b3df6eefc57b248a505af36 (patch) | |
| tree | 3acce26316cc84144a399be69c898ce18f6c4658 | |
| parent | e3e929f8c342b32dc8f5296adf8fb337866fa40a (diff) | |
radv: Don't pass a TESS_EVAL shader when tesselation is not enabled.
Otherwise on pre-GFX9, if the constant layout allows both TESS_EVAL and
GEOMETRY shaders, but the PIPELINE has only GEOMETRY, it would return the
GEOMETRY shader for the TESS_EVAL shader.
This would cause the flush_constants code to emit the GEOMETRY constants
to the TESS_EVAL registers and then conclude that it did not need to set
the GEOMETRY shader registers.
Fixes: dfff9fb6f8d "radv: Handle GFX9 merged shaders in radv_flush_constants()"
CC: 18.1 <[email protected]>
Reviewed-by: Alex Smith <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index ff647ed9af3..375f7c357d3 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1594,6 +1594,8 @@ radv_get_shader(struct radv_pipeline *pipeline, if (pipeline->shaders[MESA_SHADER_GEOMETRY]) return pipeline->shaders[MESA_SHADER_GEOMETRY]; } else if (stage == MESA_SHADER_TESS_EVAL) { + if (!radv_pipeline_has_tess(pipeline)) + return NULL; if (pipeline->shaders[MESA_SHADER_TESS_EVAL]) return pipeline->shaders[MESA_SHADER_TESS_EVAL]; if (pipeline->shaders[MESA_SHADER_GEOMETRY]) |