From 60cc065c7dbf0291c69638fdd6a6597050814e57 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 27 Apr 2020 17:27:22 +0200 Subject: aco: fix adjusting the sample index with FMASK if value is negative MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The SPIR-V spec doesn't say explicitly that the sample index must be an unsigned integer. This fixes crashes with some new VK_EXT_robustness2 tests. Signed-off-by: Samuel Pitoiset Reviewed-by: Daniel Schürmann Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/compiler/aco_instruction_selection.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index b6456a0fcf7..16d76be03c9 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -5659,8 +5659,12 @@ static Temp adjust_sample_index_using_fmask(isel_context *ctx, bool da, std::vec ctx->block->instructions.emplace_back(std::move(load)); Operand sample_index4; - if (sample_index.isConstant() && sample_index.constantValue() < 16) { - sample_index4 = Operand(sample_index.constantValue() << 2); + if (sample_index.isConstant()) { + if (sample_index.constantValue() < 16) { + sample_index4 = Operand(sample_index.constantValue() << 2); + } else { + sample_index4 = Operand(0u); + } } else if (sample_index.regClass() == s1) { sample_index4 = bld.sop2(aco_opcode::s_lshl_b32, bld.def(s1), bld.def(s1, scc), sample_index, Operand(2u)); } else { -- cgit v1.2.3