diff options
author | Feng Chen <vonchenplus@gmail.com> | 2021-09-06 04:46:03 +0200 |
---|---|---|
committer | Feng Chen <vonchenplus@gmail.com> | 2021-09-06 04:46:03 +0200 |
commit | 1de9e4e121a6648521debc21a46ef145156697c0 (patch) | |
tree | db27cb247d016b477eae4e42716a4428292d269c /src/shader_recompiler/backend/spirv | |
parent | Implement intput and output fixed fnc textures (diff) | |
download | yuzu-1de9e4e121a6648521debc21a46ef145156697c0.tar yuzu-1de9e4e121a6648521debc21a46ef145156697c0.tar.gz yuzu-1de9e4e121a6648521debc21a46ef145156697c0.tar.bz2 yuzu-1de9e4e121a6648521debc21a46ef145156697c0.tar.lz yuzu-1de9e4e121a6648521debc21a46ef145156697c0.tar.xz yuzu-1de9e4e121a6648521debc21a46ef145156697c0.tar.zst yuzu-1de9e4e121a6648521debc21a46ef145156697c0.zip |
Diffstat (limited to 'src/shader_recompiler/backend/spirv')
-rw-r--r-- | src/shader_recompiler/backend/spirv/emit_context.cpp | 76 |
1 files changed, 49 insertions, 27 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_context.cpp b/src/shader_recompiler/backend/spirv/emit_context.cpp index 81c79e1ed..2809f9281 100644 --- a/src/shader_recompiler/backend/spirv/emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/emit_context.cpp @@ -6,6 +6,7 @@ #include <array> #include <climits> #include <string_view> +#include <queue> #include <fmt/format.h> @@ -1201,18 +1202,6 @@ void EmitContext::DefineInputs(const IR::Program& program) { } } } - if (loads.AnyComponent(IR::Attribute::ColorFrontDiffuseR)) { - const Id id{DefineInput(*this, F32[4], true)}; - Decorate(id, spv::Decoration::Location, static_cast<u32>(11)); - input_front_color = id; - } - for (size_t index = 0; index < IR::NUM_FIXEDFNCTEXTURE; ++index) { - if (loads.AnyComponent(IR::Attribute::FixedFncTexture0S + index * 4)) { - const Id id{DefineInput(*this, F32[4], true)}; - Decorate(id, spv::Decoration::Location, static_cast<u32>(12)); - input_fixed_fnc_textures[index] = id; - } - } if (loads[IR::Attribute::InstanceId]) { if (profile.support_vertex_instance_id) { instance_id = DefineInput(*this, U32[1], true, spv::BuiltIn::InstanceId); @@ -1239,17 +1228,15 @@ void EmitContext::DefineInputs(const IR::Program& program) { loads[IR::Attribute::TessellationEvaluationPointV]) { tess_coord = DefineInput(*this, F32[3], false, spv::BuiltIn::TessCoord); } + std::queue<u32> ununsed_location; for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { const AttributeType input_type{runtime_info.generic_input_types[index]}; - if (!runtime_info.previous_stage_stores.Generic(index)) { - continue; - } - if (!loads.Generic(index)) { - continue; - } - if (input_type == AttributeType::Disabled) { + if (!runtime_info.previous_stage_stores.Generic(index) || !loads.Generic(index) || + input_type == AttributeType::Disabled) { + ununsed_location.push(static_cast<u32>(index)); continue; } + const Id type{GetAttributeType(*this, input_type)}; const Id id{DefineInput(*this, type, true)}; Decorate(id, spv::Decoration::Location, static_cast<u32>(index)); @@ -1275,6 +1262,28 @@ void EmitContext::DefineInputs(const IR::Program& program) { break; } } + if (loads.AnyComponent(IR::Attribute::ColorFrontDiffuseR)) { + if (ununsed_location.empty()) { + throw RuntimeError("Unable to get an unused location"); + } + u32 location = ununsed_location.front(); + ununsed_location.pop(); + const Id id{DefineInput(*this, F32[4], true)}; + Decorate(id, spv::Decoration::Location, location); + input_front_color = id; + } + for (size_t index = 0; index < IR::NUM_FIXEDFNCTEXTURE; ++index) { + if (loads.AnyComponent(IR::Attribute::FixedFncTexture0S + index * 4)) { + if (ununsed_location.empty()) { + throw RuntimeError("Unable to get an unused location"); + } + u32 location = ununsed_location.front(); + ununsed_location.pop(); + const Id id{DefineInput(*this, F32[4], true)}; + Decorate(id, spv::Decoration::Location, location); + input_fixed_fnc_textures[index] = id; + } + } if (stage == Stage::TessellationEval) { for (size_t index = 0; index < info.uses_patches.size(); ++index) { if (!info.uses_patches[index]) { @@ -1325,23 +1334,36 @@ void EmitContext::DefineOutputs(const IR::Program& program) { viewport_mask = DefineOutput(*this, TypeArray(U32[1], Const(1u)), std::nullopt, spv::BuiltIn::ViewportMaskNV); } - if (info.stores.AnyComponent(IR::Attribute::ColorFrontDiffuseR) || stage == Stage::VertexB) { + std::queue<u32> ununsed_location; + for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { + if (info.stores.Generic(index)) { + DefineGenericOutput(*this, index, invocations); + } else { + ununsed_location.push(static_cast<u32>(index)); + } + } + if (info.stores.AnyComponent(IR::Attribute::ColorFrontDiffuseR)) { + if (ununsed_location.empty()) { + throw RuntimeError("Unable to get an unused location"); + } + u32 location = ununsed_location.front(); + ununsed_location.pop(); const Id id{DefineOutput(*this, F32[4], invocations)}; - Decorate(id, spv::Decoration::Location, static_cast<u32>(11)); + Decorate(id, spv::Decoration::Location, location); output_front_color = id; } for (size_t index = 0; index < IR::NUM_FIXEDFNCTEXTURE; ++index) { if (info.stores.AnyComponent(IR::Attribute::FixedFncTexture0S + index * 4)) { + if (ununsed_location.empty()) { + throw RuntimeError("Unable to get an unused location"); + } + u32 location = ununsed_location.front(); + ununsed_location.pop(); const Id id{DefineOutput(*this, F32[4], invocations)}; - Decorate(id, spv::Decoration::Location, static_cast<u32>(12)); + Decorate(id, spv::Decoration::Location, location); output_fixed_fnc_textures[index] = id; } } - for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { - if (info.stores.Generic(index)) { - DefineGenericOutput(*this, index, invocations); - } - } switch (stage) { case Stage::TessellationControl: if (info.stores_tess_level_outer) { |