AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: fix adjusting the sample index with FMASK if value is negative

Browse Source 
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 <samuel.pitoiset@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4775>
This commit is contained in:
Samuel Pitoiset
2020-04-27 17:27:22 +02:00
committed by Marge Bot
parent a112ec4c11
commit 60cc065c7d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_instruction_selection.cpp
+6 -2
View File
@@ -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 {