From cf26f375ff2bfc84445270cf1077504ab4cc41f6 Mon Sep 17 00:00:00 2001
From: Feng Chen <vonchenplus@gmail.com>
Date: Fri, 3 Sep 2021 22:55:53 +0800
Subject: [PATCH] Fix create GraphicsPipelines crash
---
src/shader_recompiler/backend/spirv/emit_context.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/shader_recompiler/backend/spirv/emit_context.cpp b/src/shader_recompiler/backend/spirv/emit_context.cpp
index ff0501b76..78ca97d91 100644
--- a/src/shader_recompiler/backend/spirv/emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_context.cpp
@@ -1201,14 +1201,14 @@ void EmitContext::DefineInputs(const IR::Program& program) {
}
}
}
- if (loads.AllComponents(IR::Attribute::ColorFrontDiffuseR)) {
+ if (loads.AnyComponent(IR::Attribute::ColorFrontDiffuseR)) {
const Id id{DefineInput(*this, F32[4], true)};
- Decorate(id, spv::Decoration::Location, static_cast<u32>(55));
+ Decorate(id, spv::Decoration::Location, static_cast<u32>(11));
input_front_color = id;
}
if (loads.AnyComponent(IR::Attribute::FixedFncTexture0S)) {
const Id id{DefineInput(*this, F32[4], true)};
- Decorate(id, spv::Decoration::Location, static_cast<u32>(56));
+ Decorate(id, spv::Decoration::Location, static_cast<u32>(12));
input_txt_coord = id;
}
if (loads[IR::Attribute::InstanceId]) {
@@ -1294,7 +1294,7 @@ void EmitContext::DefineOutputs(const IR::Program& program) {
}
if (info.stores.AnyComponent(IR::Attribute::ColorFrontDiffuseR) || stage == Stage::VertexB) {
const Id id{DefineOutput(*this, F32[4], invocations)};
- Decorate(id, spv::Decoration::Location, static_cast<u32>(55));
+ Decorate(id, spv::Decoration::Location, static_cast<u32>(11));
output_front_color = id;
}
if (info.stores[IR::Attribute::PointSize] || runtime_info.fixed_state_point_size) {
@@ -1331,7 +1331,7 @@ void EmitContext::DefineOutputs(const IR::Program& program) {
if (info.stores.AnyComponent(IR::Attribute::FixedFncTexture0S)) {
const Id id{DefineOutput(*this, F32[4], invocations)};
- Decorate(id, spv::Decoration::Location, static_cast<u32>(56));
+ Decorate(id, spv::Decoration::Location, static_cast<u32>(12));
output_txt_coord = id;
}