diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-12-30 18:54:53 +0100 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2019-12-30 20:31:48 +0100 |
commit | b3371ed09e6866e235141119f9eecc2bb962dc8d (patch) | |
tree | 06619df9bd72cc0d73a3869b040b20804e2d3109 /src/video_core/shader | |
parent | Merge pull request #3250 from ReinUsesLisp/empty-fragment (diff) | |
download | yuzu-b3371ed09e6866e235141119f9eecc2bb962dc8d.tar yuzu-b3371ed09e6866e235141119f9eecc2bb962dc8d.tar.gz yuzu-b3371ed09e6866e235141119f9eecc2bb962dc8d.tar.bz2 yuzu-b3371ed09e6866e235141119f9eecc2bb962dc8d.tar.lz yuzu-b3371ed09e6866e235141119f9eecc2bb962dc8d.tar.xz yuzu-b3371ed09e6866e235141119f9eecc2bb962dc8d.tar.zst yuzu-b3371ed09e6866e235141119f9eecc2bb962dc8d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/shader/node.h | 28 | ||||
-rw-r--r-- | src/video_core/shader/shader_ir.cpp | 6 | ||||
-rw-r--r-- | src/video_core/shader/shader_ir.h | 8 |
3 files changed, 39 insertions, 3 deletions
diff --git a/src/video_core/shader/node.h b/src/video_core/shader/node.h index 4d2f4d6a8..42e82ab74 100644 --- a/src/video_core/shader/node.h +++ b/src/video_core/shader/node.h @@ -392,8 +392,30 @@ struct MetaImage { using Meta = std::variant<MetaArithmetic, MetaTexture, MetaImage, MetaStackClass, Tegra::Shader::HalfType>; +class AmendNode { +public: + std::optional<u32> GetAmendIndex() const { + if (amend_index == amend_null_index) { + return std::nullopt; + } + return {amend_index}; + } + + void SetAmendIndex(u32 index) { + amend_index = index; + } + + void ClearAmend() { + amend_index = amend_null_index; + } + +private: + static constexpr u32 amend_null_index = 0xFFFFFFFF; + u32 amend_index{amend_null_index}; +}; + /// Holds any kind of operation that can be done in the IR -class OperationNode final { +class OperationNode final : public AmendNode { public: explicit OperationNode(OperationCode code) : OperationNode(code, Meta{}) {} @@ -433,7 +455,7 @@ private: }; /// Encloses inside any kind of node that returns a boolean conditionally-executed code -class ConditionalNode final { +class ConditionalNode final : public AmendNode { public: explicit ConditionalNode(Node condition, std::vector<Node>&& code) : condition{std::move(condition)}, code{std::move(code)} {} @@ -630,7 +652,7 @@ private: }; /// Commentary, can be dropped -class CommentNode final { +class CommentNode final : public AmendNode { public: explicit CommentNode(std::string text) : text{std::move(text)} {} diff --git a/src/video_core/shader/shader_ir.cpp b/src/video_core/shader/shader_ir.cpp index 1d9825c76..49678767c 100644 --- a/src/video_core/shader/shader_ir.cpp +++ b/src/video_core/shader/shader_ir.cpp @@ -446,4 +446,10 @@ Node ShaderIR::BitfieldInsert(Node base, Node insert, u32 offset, u32 bits) { Immediate(bits)); } +u32 ShaderIR::DeclareAmend(Node new_amend) { + const u32 id = static_cast<u32>(amend_code.size()); + amend_code.push_back(new_amend); + return id; +} + } // namespace VideoCommon::Shader diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h index baed06ccd..52f130e1b 100644 --- a/src/video_core/shader/shader_ir.h +++ b/src/video_core/shader/shader_ir.h @@ -176,6 +176,10 @@ public: /// Returns a condition code evaluated from internal flags Node GetConditionCode(Tegra::Shader::ConditionCode cc) const; + const Node& GetAmendNode(u32 index) const { + return amend_code[index]; + } + private: friend class ASTDecoder; @@ -392,6 +396,9 @@ private: Tegra::Shader::Instruction instr, bool is_write); + /// Amends + u32 DeclareAmend(Node new_amend); + const ProgramCode& program_code; const u32 main_offset; const CompilerSettings settings; @@ -406,6 +413,7 @@ private: std::map<u32, NodeBlock> basic_blocks; NodeBlock global_code; ASTManager program_manager{true, true}; + NodeBlock amend_code; std::set<u32> used_registers; std::set<Tegra::Shader::Pred> used_predicates; |