From abefe293986f42b8912a561b7978e952eca7bfee Mon Sep 17 00:00:00 2001 From: FernandoS27 Date: Fri, 19 Oct 2018 19:47:06 -0400 Subject: [PATCH] Implement Shader Local Memory --- .../renderer_opengl/gl_shader_decompiler.cpp | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 81ffb24e42..c1a86755aa 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -279,6 +279,7 @@ public: const Tegra::Shader::Header& header) : shader{shader}, declarations{declarations}, stage{stage}, suffix{suffix}, header{header}, fixed_pipeline_output_attributes_used{} { + local_memory_size = 0; BuildRegisterList(); BuildInputList(); } @@ -436,6 +437,24 @@ public: shader.AddLine(dest + " = " + src + ';'); } + std::string GetLocalMemoryAsFloat(const std::string index) { + return "lmem[" + index + "]"; + } + + std::string GetLocalMemoryAsInteger(const std::string index, bool is_signed = false) { + const std::string func{is_signed ? "floatToIntBits" : "floatBitsToUint"}; + return func + "(lmem[" + index + "])"; + } + + void SetLocalMemoryAsFloat(const std::string index, const std::string value) { + shader.AddLine("lmem[" + index + "] = " + value); + } + + void SetLocalMemoryAsInteger(const std::string index, const std::string value, bool is_signed = false) { + const std::string func{is_signed ? "intBitsToFloat" : "uintBitsToFloat"}; + shader.AddLine("lmem[" + index + "] = " + func + '(' + value + ')'); + } + std::string GetControlCode(const Tegra::Shader::ControlCode cc) const { switch (cc) { case Tegra::Shader::ControlCode::NEU: @@ -533,6 +552,7 @@ public: void GenerateDeclarations(const std::string& suffix) { GenerateVertex(); GenerateRegisters(suffix); + GenerateLocalMemory(); GenerateInternalFlags(); GenerateInputAttrs(); GenerateOutputAttrs(); @@ -578,6 +598,10 @@ public: return entry.GetName(); } + void SetLocalMemory(u64 lmem) { + local_memory_size = lmem; + } + private: /// Generates declarations for registers. void GenerateRegisters(const std::string& suffix) { @@ -588,6 +612,14 @@ private: declarations.AddNewLine(); } + /// Generates declarations for local memory. + void GenerateLocalMemory() { + if (local_memory_size > 0) { + declarations.AddLine("float lmem[" + std::to_string((local_memory_size - 1 + 4) / 4) + "];"); + declarations.AddNewLine(); + } + } + /// Generates declarations for internal flags. void GenerateInternalFlags() { for (u32 ii = 0; ii < static_cast(InternalFlag::Amount); ii++) { @@ -895,6 +927,7 @@ private: const std::string& suffix; const Tegra::Shader::Header& header; std::unordered_set fixed_pipeline_output_attributes_used; + u64 local_memory_size; }; class GLSLGenerator { @@ -904,6 +937,9 @@ public: : subroutines(subroutines), program_code(program_code), main_offset(main_offset), stage(stage), suffix(suffix) { std::memcpy(&header, program_code.data(), sizeof(Tegra::Shader::Header)); + local_memory_size = (header.common2.shader_local_memory_high_size << 24) | + header.common1.shader_local_memory_low_size; + regs.SetLocalMemory(local_memory_size); Generate(suffix); } @@ -3575,6 +3611,7 @@ private: const u32 main_offset; Maxwell3D::Regs::ShaderStage stage; const std::string& suffix; + u64 local_memory_size; ShaderWriter shader; ShaderWriter declarations;