From 5286a7bc4ccf8da0827b0352f40dbce651b57d09 Mon Sep 17 00:00:00 2001 From: ameerj <52414509+ameerj@users.noreply.github.com> Date: Sun, 5 Dec 2021 16:33:44 -0500 Subject: shader_recompiler: Rename backend emit_context files --- .../backend/glasm/emit_context.cpp | 156 --------------------- src/shader_recompiler/backend/glasm/emit_context.h | 80 ----------- .../backend/glasm/glasm_emit_context.cpp | 156 +++++++++++++++++++++ .../backend/glasm/glasm_emit_context.h | 80 +++++++++++ 4 files changed, 236 insertions(+), 236 deletions(-) delete mode 100644 src/shader_recompiler/backend/glasm/emit_context.cpp delete mode 100644 src/shader_recompiler/backend/glasm/emit_context.h create mode 100644 src/shader_recompiler/backend/glasm/glasm_emit_context.cpp create mode 100644 src/shader_recompiler/backend/glasm/glasm_emit_context.h (limited to 'src/shader_recompiler/backend/glasm') diff --git a/src/shader_recompiler/backend/glasm/emit_context.cpp b/src/shader_recompiler/backend/glasm/emit_context.cpp deleted file mode 100644 index 8fd459dfe..000000000 --- a/src/shader_recompiler/backend/glasm/emit_context.cpp +++ /dev/null @@ -1,156 +0,0 @@ -// Copyright 2021 yuzu Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include - -#include "shader_recompiler/backend/bindings.h" -#include "shader_recompiler/backend/glasm/emit_context.h" -#include "shader_recompiler/backend/glasm/emit_glasm.h" -#include "shader_recompiler/frontend/ir/program.h" -#include "shader_recompiler/profile.h" -#include "shader_recompiler/runtime_info.h" - -namespace Shader::Backend::GLASM { -namespace { -std::string_view InterpDecorator(Interpolation interp) { - switch (interp) { - case Interpolation::Smooth: - return ""; - case Interpolation::Flat: - return "FLAT "; - case Interpolation::NoPerspective: - return "NOPERSPECTIVE "; - } - throw InvalidArgument("Invalid interpolation {}", interp); -} - -bool IsInputArray(Stage stage) { - return stage == Stage::Geometry || stage == Stage::TessellationControl || - stage == Stage::TessellationEval; -} -} // Anonymous namespace - -EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_, - const RuntimeInfo& runtime_info_) - : info{program.info}, profile{profile_}, runtime_info{runtime_info_} { - // FIXME: Temporary partial implementation - u32 cbuf_index{}; - for (const auto& desc : info.constant_buffer_descriptors) { - if (desc.count != 1) { - throw NotImplementedException("Constant buffer descriptor array"); - } - Add("CBUFFER c{}[]={{program.buffer[{}]}};", desc.index, cbuf_index); - ++cbuf_index; - } - u32 ssbo_index{}; - for (const auto& desc : info.storage_buffers_descriptors) { - if (desc.count != 1) { - throw NotImplementedException("Storage buffer descriptor array"); - } - if (runtime_info.glasm_use_storage_buffers) { - Add("STORAGE ssbo{}[]={{program.storage[{}]}};", ssbo_index, bindings.storage_buffer); - ++bindings.storage_buffer; - ++ssbo_index; - } - } - if (!runtime_info.glasm_use_storage_buffers) { - if (const size_t num = info.storage_buffers_descriptors.size(); num > 0) { - const size_t index{num + PROGRAM_LOCAL_PARAMETER_STORAGE_BUFFER_BASE}; - Add("PARAM c[{}]={{program.local[0..{}]}};", index, index - 1); - } - } - stage = program.stage; - switch (program.stage) { - case Stage::VertexA: - case Stage::VertexB: - stage_name = "vertex"; - attrib_name = "vertex"; - break; - case Stage::TessellationControl: - case Stage::TessellationEval: - stage_name = "primitive"; - attrib_name = "primitive"; - break; - case Stage::Geometry: - stage_name = "primitive"; - attrib_name = "vertex"; - break; - case Stage::Fragment: - stage_name = "fragment"; - attrib_name = "fragment"; - break; - case Stage::Compute: - stage_name = "invocation"; - break; - } - const std::string_view attr_stage{stage == Stage::Fragment ? "fragment" : "vertex"}; - const VaryingState loads{info.loads.mask | info.passthrough.mask}; - for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { - if (loads.Generic(index)) { - Add("{}ATTRIB in_attr{}[]={{{}.attrib[{}..{}]}};", - InterpDecorator(info.interpolation[index]), index, attr_stage, index, index); - } - } - if (IsInputArray(stage) && loads.AnyComponent(IR::Attribute::PositionX)) { - Add("ATTRIB vertex_position=vertex.position;"); - } - if (info.uses_invocation_id) { - Add("ATTRIB primitive_invocation=primitive.invocation;"); - } - if (info.stores_tess_level_outer) { - Add("OUTPUT result_patch_tessouter[]={{result.patch.tessouter[0..3]}};"); - } - if (info.stores_tess_level_inner) { - Add("OUTPUT result_patch_tessinner[]={{result.patch.tessinner[0..1]}};"); - } - if (info.stores.ClipDistances()) { - Add("OUTPUT result_clip[]={{result.clip[0..7]}};"); - } - for (size_t index = 0; index < info.uses_patches.size(); ++index) { - if (!info.uses_patches[index]) { - continue; - } - if (stage == Stage::TessellationControl) { - Add("OUTPUT result_patch_attrib{}[]={{result.patch.attrib[{}..{}]}};" - "ATTRIB primitive_out_patch_attrib{}[]={{primitive.out.patch.attrib[{}..{}]}};", - index, index, index, index, index, index); - } else { - Add("ATTRIB primitive_patch_attrib{}[]={{primitive.patch.attrib[{}..{}]}};", index, - index, index); - } - } - if (stage == Stage::Fragment) { - Add("OUTPUT frag_color0=result.color;"); - for (size_t index = 1; index < info.stores_frag_color.size(); ++index) { - Add("OUTPUT frag_color{}=result.color[{}];", index, index); - } - } - for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { - if (info.stores.Generic(index)) { - Add("OUTPUT out_attr{}[]={{result.attrib[{}..{}]}};", index, index, index); - } - } - image_buffer_bindings.reserve(info.image_buffer_descriptors.size()); - for (const auto& desc : info.image_buffer_descriptors) { - image_buffer_bindings.push_back(bindings.image); - bindings.image += desc.count; - } - image_bindings.reserve(info.image_descriptors.size()); - for (const auto& desc : info.image_descriptors) { - image_bindings.push_back(bindings.image); - bindings.image += desc.count; - } - texture_buffer_bindings.reserve(info.texture_buffer_descriptors.size()); - for (const auto& desc : info.texture_buffer_descriptors) { - texture_buffer_bindings.push_back(bindings.texture); - bindings.texture += desc.count; - } - texture_bindings.reserve(info.texture_descriptors.size()); - for (const auto& desc : info.texture_descriptors) { - texture_bindings.push_back(bindings.texture); - bindings.texture += desc.count; - } -} - -} // namespace Shader::Backend::GLASM diff --git a/src/shader_recompiler/backend/glasm/emit_context.h b/src/shader_recompiler/backend/glasm/emit_context.h deleted file mode 100644 index 8433e5c00..000000000 --- a/src/shader_recompiler/backend/glasm/emit_context.h +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright 2021 yuzu Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include -#include -#include - -#include - -#include "shader_recompiler/backend/glasm/reg_alloc.h" -#include "shader_recompiler/stage.h" - -namespace Shader { -struct Info; -struct Profile; -struct RuntimeInfo; -} // namespace Shader - -namespace Shader::Backend { -struct Bindings; -} - -namespace Shader::IR { -class Inst; -struct Program; -} // namespace Shader::IR - -namespace Shader::Backend::GLASM { - -class EmitContext { -public: - explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_, - const RuntimeInfo& runtime_info_); - - template - void Add(const char* format_str, IR::Inst& inst, Args&&... args) { - code += fmt::format(fmt::runtime(format_str), reg_alloc.Define(inst), - std::forward(args)...); - // TODO: Remove this - code += '\n'; - } - - template - void LongAdd(const char* format_str, IR::Inst& inst, Args&&... args) { - code += fmt::format(fmt::runtime(format_str), reg_alloc.LongDefine(inst), - std::forward(args)...); - // TODO: Remove this - code += '\n'; - } - - template - void Add(const char* format_str, Args&&... args) { - code += fmt::format(fmt::runtime(format_str), std::forward(args)...); - // TODO: Remove this - code += '\n'; - } - - std::string code; - RegAlloc reg_alloc{}; - const Info& info; - const Profile& profile; - const RuntimeInfo& runtime_info; - - std::vector texture_buffer_bindings; - std::vector image_buffer_bindings; - std::vector texture_bindings; - std::vector image_bindings; - - Stage stage{}; - std::string_view stage_name = "invalid"; - std::string_view attrib_name = "invalid"; - - u32 num_safety_loop_vars{}; - bool uses_y_direction{}; -}; - -} // namespace Shader::Backend::GLASM diff --git a/src/shader_recompiler/backend/glasm/glasm_emit_context.cpp b/src/shader_recompiler/backend/glasm/glasm_emit_context.cpp new file mode 100644 index 000000000..8fd459dfe --- /dev/null +++ b/src/shader_recompiler/backend/glasm/glasm_emit_context.cpp @@ -0,0 +1,156 @@ +// Copyright 2021 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include + +#include "shader_recompiler/backend/bindings.h" +#include "shader_recompiler/backend/glasm/emit_context.h" +#include "shader_recompiler/backend/glasm/emit_glasm.h" +#include "shader_recompiler/frontend/ir/program.h" +#include "shader_recompiler/profile.h" +#include "shader_recompiler/runtime_info.h" + +namespace Shader::Backend::GLASM { +namespace { +std::string_view InterpDecorator(Interpolation interp) { + switch (interp) { + case Interpolation::Smooth: + return ""; + case Interpolation::Flat: + return "FLAT "; + case Interpolation::NoPerspective: + return "NOPERSPECTIVE "; + } + throw InvalidArgument("Invalid interpolation {}", interp); +} + +bool IsInputArray(Stage stage) { + return stage == Stage::Geometry || stage == Stage::TessellationControl || + stage == Stage::TessellationEval; +} +} // Anonymous namespace + +EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_, + const RuntimeInfo& runtime_info_) + : info{program.info}, profile{profile_}, runtime_info{runtime_info_} { + // FIXME: Temporary partial implementation + u32 cbuf_index{}; + for (const auto& desc : info.constant_buffer_descriptors) { + if (desc.count != 1) { + throw NotImplementedException("Constant buffer descriptor array"); + } + Add("CBUFFER c{}[]={{program.buffer[{}]}};", desc.index, cbuf_index); + ++cbuf_index; + } + u32 ssbo_index{}; + for (const auto& desc : info.storage_buffers_descriptors) { + if (desc.count != 1) { + throw NotImplementedException("Storage buffer descriptor array"); + } + if (runtime_info.glasm_use_storage_buffers) { + Add("STORAGE ssbo{}[]={{program.storage[{}]}};", ssbo_index, bindings.storage_buffer); + ++bindings.storage_buffer; + ++ssbo_index; + } + } + if (!runtime_info.glasm_use_storage_buffers) { + if (const size_t num = info.storage_buffers_descriptors.size(); num > 0) { + const size_t index{num + PROGRAM_LOCAL_PARAMETER_STORAGE_BUFFER_BASE}; + Add("PARAM c[{}]={{program.local[0..{}]}};", index, index - 1); + } + } + stage = program.stage; + switch (program.stage) { + case Stage::VertexA: + case Stage::VertexB: + stage_name = "vertex"; + attrib_name = "vertex"; + break; + case Stage::TessellationControl: + case Stage::TessellationEval: + stage_name = "primitive"; + attrib_name = "primitive"; + break; + case Stage::Geometry: + stage_name = "primitive"; + attrib_name = "vertex"; + break; + case Stage::Fragment: + stage_name = "fragment"; + attrib_name = "fragment"; + break; + case Stage::Compute: + stage_name = "invocation"; + break; + } + const std::string_view attr_stage{stage == Stage::Fragment ? "fragment" : "vertex"}; + const VaryingState loads{info.loads.mask | info.passthrough.mask}; + for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { + if (loads.Generic(index)) { + Add("{}ATTRIB in_attr{}[]={{{}.attrib[{}..{}]}};", + InterpDecorator(info.interpolation[index]), index, attr_stage, index, index); + } + } + if (IsInputArray(stage) && loads.AnyComponent(IR::Attribute::PositionX)) { + Add("ATTRIB vertex_position=vertex.position;"); + } + if (info.uses_invocation_id) { + Add("ATTRIB primitive_invocation=primitive.invocation;"); + } + if (info.stores_tess_level_outer) { + Add("OUTPUT result_patch_tessouter[]={{result.patch.tessouter[0..3]}};"); + } + if (info.stores_tess_level_inner) { + Add("OUTPUT result_patch_tessinner[]={{result.patch.tessinner[0..1]}};"); + } + if (info.stores.ClipDistances()) { + Add("OUTPUT result_clip[]={{result.clip[0..7]}};"); + } + for (size_t index = 0; index < info.uses_patches.size(); ++index) { + if (!info.uses_patches[index]) { + continue; + } + if (stage == Stage::TessellationControl) { + Add("OUTPUT result_patch_attrib{}[]={{result.patch.attrib[{}..{}]}};" + "ATTRIB primitive_out_patch_attrib{}[]={{primitive.out.patch.attrib[{}..{}]}};", + index, index, index, index, index, index); + } else { + Add("ATTRIB primitive_patch_attrib{}[]={{primitive.patch.attrib[{}..{}]}};", index, + index, index); + } + } + if (stage == Stage::Fragment) { + Add("OUTPUT frag_color0=result.color;"); + for (size_t index = 1; index < info.stores_frag_color.size(); ++index) { + Add("OUTPUT frag_color{}=result.color[{}];", index, index); + } + } + for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { + if (info.stores.Generic(index)) { + Add("OUTPUT out_attr{}[]={{result.attrib[{}..{}]}};", index, index, index); + } + } + image_buffer_bindings.reserve(info.image_buffer_descriptors.size()); + for (const auto& desc : info.image_buffer_descriptors) { + image_buffer_bindings.push_back(bindings.image); + bindings.image += desc.count; + } + image_bindings.reserve(info.image_descriptors.size()); + for (const auto& desc : info.image_descriptors) { + image_bindings.push_back(bindings.image); + bindings.image += desc.count; + } + texture_buffer_bindings.reserve(info.texture_buffer_descriptors.size()); + for (const auto& desc : info.texture_buffer_descriptors) { + texture_buffer_bindings.push_back(bindings.texture); + bindings.texture += desc.count; + } + texture_bindings.reserve(info.texture_descriptors.size()); + for (const auto& desc : info.texture_descriptors) { + texture_bindings.push_back(bindings.texture); + bindings.texture += desc.count; + } +} + +} // namespace Shader::Backend::GLASM diff --git a/src/shader_recompiler/backend/glasm/glasm_emit_context.h b/src/shader_recompiler/backend/glasm/glasm_emit_context.h new file mode 100644 index 000000000..8433e5c00 --- /dev/null +++ b/src/shader_recompiler/backend/glasm/glasm_emit_context.h @@ -0,0 +1,80 @@ +// Copyright 2021 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include +#include +#include + +#include + +#include "shader_recompiler/backend/glasm/reg_alloc.h" +#include "shader_recompiler/stage.h" + +namespace Shader { +struct Info; +struct Profile; +struct RuntimeInfo; +} // namespace Shader + +namespace Shader::Backend { +struct Bindings; +} + +namespace Shader::IR { +class Inst; +struct Program; +} // namespace Shader::IR + +namespace Shader::Backend::GLASM { + +class EmitContext { +public: + explicit EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_, + const RuntimeInfo& runtime_info_); + + template + void Add(const char* format_str, IR::Inst& inst, Args&&... args) { + code += fmt::format(fmt::runtime(format_str), reg_alloc.Define(inst), + std::forward(args)...); + // TODO: Remove this + code += '\n'; + } + + template + void LongAdd(const char* format_str, IR::Inst& inst, Args&&... args) { + code += fmt::format(fmt::runtime(format_str), reg_alloc.LongDefine(inst), + std::forward(args)...); + // TODO: Remove this + code += '\n'; + } + + template + void Add(const char* format_str, Args&&... args) { + code += fmt::format(fmt::runtime(format_str), std::forward(args)...); + // TODO: Remove this + code += '\n'; + } + + std::string code; + RegAlloc reg_alloc{}; + const Info& info; + const Profile& profile; + const RuntimeInfo& runtime_info; + + std::vector texture_buffer_bindings; + std::vector image_buffer_bindings; + std::vector texture_bindings; + std::vector image_bindings; + + Stage stage{}; + std::string_view stage_name = "invalid"; + std::string_view attrib_name = "invalid"; + + u32 num_safety_loop_vars{}; + bool uses_y_direction{}; +}; + +} // namespace Shader::Backend::GLASM -- cgit v1.2.3