summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp103
-rw-r--r--src/video_core/shader/decode/memory.cpp294
-rw-r--r--src/video_core/shader/shader_ir.cpp8
-rw-r--r--src/video_core/shader/shader_ir.h60
4 files changed, 224 insertions, 241 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 36dc34777..37c4856d2 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <array>
#include <string>
#include <string_view>
#include <variant>
@@ -770,49 +771,6 @@ private:
return {};
}
- std::string AssignComposite(Operation operation) {
- const auto& meta = std::get<MetaComponents>(operation.GetMeta());
-
- const std::string composite = code.GenerateTemporal();
- code.AddLine("vec4 " + composite + " = " + Visit(operation[0]) + ';');
-
- constexpr u32 composite_size = 4;
- for (u32 i = 0; i < composite_size; ++i) {
- const auto gpr = std::get<GprNode>(*operation[i + 1]).GetIndex();
- if (gpr == Register::ZeroIndex) {
- continue;
- }
- code.AddLine(GetRegister(gpr) + " = " + composite +
- GetSwizzle(meta.GetSourceComponent(i)) + ';');
- }
- return {};
- }
-
- std::string AssignCompositeHalf(Operation operation) {
- const auto& meta = std::get<MetaComponents>(operation.GetMeta());
-
- const std::string composite = code.GenerateTemporal();
- code.AddLine("vec4 " + composite + " = " + Visit(operation[0]) + ';');
-
- const auto ReadComponent = [&](u32 component) {
- if (component < meta.count) {
- return composite + '[' + std::to_string(meta.GetSourceComponent(component)) + ']';
- }
- return std::string("0");
- };
-
- const auto dst1 = std::get<GprNode>(*operation[1]).GetIndex();
- const std::string src1 = "vec2(" + ReadComponent(0) + ", " + ReadComponent(1) + ')';
- code.AddLine(GetRegister(dst1) + " = utof(packHalf2x16(" + src1 + "))");
-
- if (meta.count > 2) {
- const auto dst2 = std::get<GprNode>(*operation[2]).GetIndex();
- const std::string src2 = "vec2(" + ReadComponent(2) + ", " + ReadComponent(3) + ')';
- code.AddLine(GetRegister(dst2) + " = utof(packHalf2x16(" + src2 + "));");
- }
- return {};
- }
-
std::string Composite(Operation operation) {
std::string value = "vec4(";
for (std::size_t i = 0; i < 4; ++i) {
@@ -1018,6 +976,10 @@ private:
Visit(operation[1]) + ")[1]))";
}
+ std::string HPack2(Operation operation) {
+ return "utof(packHalf2x16(vec2(" + Visit(operation[0]) + ", " + Visit(operation[1]) + ")))";
+ }
+
template <Type type>
std::string LogicalLessThan(Operation operation) {
return GenerateBinaryInfix(operation, "<", Type::Bool, type, type);
@@ -1137,30 +1099,35 @@ private:
}
std::string F4Texture(Operation operation) {
+ const auto meta = std::get<MetaTexture>(operation.GetMeta());
std::string expr = GenerateTexture(operation, "texture");
- if (std::get<MetaTexture>(operation.GetMeta()).sampler.IsShadow()) {
+ if (meta.sampler.IsShadow()) {
expr = "vec4(" + expr + ')';
}
- return expr;
+ return expr + GetSwizzle(meta.element);
}
std::string F4TextureLod(Operation operation) {
+ const auto meta = std::get<MetaTexture>(operation.GetMeta());
std::string expr = GenerateTexture(operation, "textureLod");
- if (std::get<MetaTexture>(operation.GetMeta()).sampler.IsShadow()) {
+ if (meta.sampler.IsShadow()) {
expr = "vec4(" + expr + ')';
}
- return expr;
+ return expr + GetSwizzle(meta.element);
}
std::string F4TextureGather(Operation operation) {
- const bool is_shadow = std::get<MetaTexture>(operation.GetMeta()).sampler.IsShadow();
- if (is_shadow) {
- return GenerateTexture(operation, "textureGather",
+ const auto meta = std::get<MetaTexture>(operation.GetMeta());
+
+ std::string expr;
+ if (meta.sampler.IsShadow()) {
+ expr = GenerateTexture(operation, "textureGather",
[](std::string ref_z) { return ref_z; });
} else {
- return GenerateTexture(operation, "textureGather",
+ expr = GenerateTexture(operation, "textureGather",
[](std::string comp) { return "ftoi(" + comp + ')'; });
}
+ return expr + GetSwizzle(meta.element);
}
std::string F4TextureQueryDimensions(Operation operation) {
@@ -1168,20 +1135,26 @@ private:
const std::string sampler = GetSampler(meta.sampler);
const std::string lod = VisitOperand(operation, 0, Type::Int);
- const std::string sizes = code.GenerateTemporal();
- code.AddLine("ivec2 " + sizes + " = textureSize(" + sampler + ", " + lod + ");");
-
- const std::string mip_level = "textureQueryLevels(" + sampler + ')';
-
- return "itof(ivec4(" + sizes + ", 0, " + mip_level + "))";
+ switch (meta.element) {
+ case 0:
+ case 1:
+ return "textureSize(" + sampler + ", " + lod + ')' + GetSwizzle(meta.element);
+ case 2:
+ return "0";
+ case 3:
+ return "textureQueryLevels(" + sampler + ')';
+ }
+ UNREACHABLE();
+ return "0";
}
std::string F4TextureQueryLod(Operation operation) {
- const std::string tmp = code.GenerateTemporal();
- code.AddLine("vec2 " + tmp + " = " + GenerateTexture(operation, "textureQueryLod") +
- " * vec2(256);");
-
- return "vec4(itof(int(" + tmp + ".y)), utof(uint(" + tmp + ".x)), 0, 0)";
+ const auto& meta = std::get<MetaTexture>(operation.GetMeta());
+ if (meta.element < 2) {
+ return "itof(int((" + GenerateTexture(operation, "textureQueryLod") + " * vec2(256))" +
+ GetSwizzle(meta.element) + "))";
+ }
+ return "0";
}
std::string F4TexelFetch(Operation operation) {
@@ -1206,7 +1179,7 @@ private:
}
}
expr += ')';
- return expr;
+ return expr + GetSwizzle(meta.element);
}
std::string Branch(Operation operation) {
@@ -1328,10 +1301,7 @@ private:
static constexpr OperationDecompilersArray operation_decompilers = {
&GLSLDecompiler::Assign,
- &GLSLDecompiler::AssignComposite,
- &GLSLDecompiler::AssignCompositeHalf,
- &GLSLDecompiler::Composite,
&GLSLDecompiler::Select,
&GLSLDecompiler::Add<Type::Float>,
@@ -1403,6 +1373,7 @@ private:
&GLSLDecompiler::HMergeF32,
&GLSLDecompiler::HMergeH0,
&GLSLDecompiler::HMergeH1,
+ &GLSLDecompiler::HPack2,
&GLSLDecompiler::LogicalAssign,
&GLSLDecompiler::LogicalAnd,
diff --git a/src/video_core/shader/decode/memory.cpp b/src/video_core/shader/decode/memory.cpp
index f3f78a662..5ae3f344d 100644
--- a/src/video_core/shader/decode/memory.cpp
+++ b/src/video_core/shader/decode/memory.cpp
@@ -90,15 +90,10 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
const Node op_b =
GetConstBufferIndirect(instr.cbuf36.index, instr.cbuf36.offset + 4, index);
- const Node composite =
- Operation(OperationCode::Composite, op_a, op_b, GetRegister(Register::ZeroIndex),
- GetRegister(Register::ZeroIndex));
-
- MetaComponents meta{{0, 1, 2, 3}};
- bb.push_back(Operation(OperationCode::AssignComposite, meta, composite,
- GetRegister(instr.gpr0), GetRegister(instr.gpr0.Value() + 1),
- GetRegister(Register::ZeroIndex),
- GetRegister(Register::ZeroIndex)));
+ SetTemporal(bb, 0, op_a);
+ SetTemporal(bb, 1, op_b);
+ SetRegister(bb, instr.gpr0, GetTemporal(0));
+ SetRegister(bb, instr.gpr0.Value() + 1, GetTemporal(1));
break;
}
default:
@@ -172,10 +167,6 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
break;
}
case OpCode::Id::TEX: {
- Tegra::Shader::TextureType texture_type{instr.tex.texture_type};
- const bool is_array = instr.tex.array != 0;
- const bool depth_compare = instr.tex.UsesMiscMode(TextureMiscMode::DC);
- const auto process_mode = instr.tex.GetTextureProcessMode();
UNIMPLEMENTED_IF_MSG(instr.tex.UsesMiscMode(TextureMiscMode::AOFFI),
"AOFFI is not implemented");
@@ -183,27 +174,12 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
LOG_WARNING(HW_GPU, "TEX.NODEP implementation is incomplete");
}
- const Node texture = GetTexCode(instr, texture_type, process_mode, depth_compare, is_array);
-
- MetaComponents meta;
- std::array<Node, 4> dest;
-
- std::size_t dest_elem = 0;
- for (std::size_t elem = 0; elem < 4; ++elem) {
- if (!instr.tex.IsComponentEnabled(elem)) {
- // Skip disabled components
- continue;
- }
- meta.components_map[dest_elem] = static_cast<u32>(elem);
- dest[dest_elem] = GetRegister(instr.gpr0.Value() + dest_elem);
-
- ++dest_elem;
- }
- std::generate(dest.begin() + dest_elem, dest.end(),
- [&]() { return GetRegister(Register::ZeroIndex); });
-
- bb.push_back(Operation(OperationCode::AssignComposite, std::move(meta), texture, dest[0],
- dest[1], dest[2], dest[3]));
+ const TextureType texture_type{instr.tex.texture_type};
+ const bool is_array = instr.tex.array != 0;
+ const bool depth_compare = instr.tex.UsesMiscMode(TextureMiscMode::DC);
+ const auto process_mode = instr.tex.GetTextureProcessMode();
+ WriteTexInstructionFloat(
+ bb, instr, GetTexCode(instr, texture_type, process_mode, depth_compare, is_array));
break;
}
case OpCode::Id::TEXS: {
@@ -216,13 +192,13 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
LOG_WARNING(HW_GPU, "TEXS.NODEP implementation is incomplete");
}
- const Node texture =
+ const Node4 components =
GetTexsCode(instr, texture_type, process_mode, depth_compare, is_array);
if (instr.texs.fp32_flag) {
- WriteTexsInstructionFloat(bb, instr, texture);
+ WriteTexsInstructionFloat(bb, instr, components);
} else {
- WriteTexsInstructionHalfFloat(bb, instr, texture);
+ WriteTexsInstructionHalfFloat(bb, instr, components);
}
break;
}
@@ -242,27 +218,8 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
const auto texture_type = instr.tld4.texture_type.Value();
const bool depth_compare = instr.tld4.UsesMiscMode(TextureMiscMode::DC);
const bool is_array = instr.tld4.array != 0;
- const Node texture = GetTld4Code(instr, texture_type, depth_compare, is_array);
-
- MetaComponents meta_components;
- std::array<Node, 4> dest;
-
- std::size_t dest_elem = 0;
- for (std::size_t elem = 0; elem < 4; ++elem) {
- if (!instr.tex.IsComponentEnabled(elem)) {
- // Skip disabled components
- continue;
- }
- meta_components.components_map[dest_elem] = static_cast<u32>(elem);
- dest[dest_elem] = GetRegister(instr.gpr0.Value() + dest_elem);
-
- ++dest_elem;
- }
- std::generate(dest.begin() + dest_elem, dest.end(),
- [&]() { return GetRegister(Register::ZeroIndex); });
-
- bb.push_back(Operation(OperationCode::AssignComposite, std::move(meta_components), texture,
- dest[0], dest[1], dest[2], dest[3]));
+ WriteTexInstructionFloat(bb, instr,
+ GetTld4Code(instr, texture_type, depth_compare, is_array));
break;
}
case OpCode::Id::TLD4S: {
@@ -277,28 +234,34 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
const Node op_a = GetRegister(instr.gpr8);
const Node op_b = GetRegister(instr.gpr20);
- std::vector<Node> params;
+ std::vector<Node> coords;
// TODO(Subv): Figure out how the sampler type is encoded in the TLD4S instruction.
if (depth_compare) {
// Note: TLD4S coordinate encoding works just like TEXS's
const Node op_y = GetRegister(instr.gpr8.Value() + 1);
- params.push_back(op_a);
- params.push_back(op_y);
- params.push_back(op_b);
+ coords.push_back(op_a);
+ coords.push_back(op_y);
+ coords.push_back(op_b);
} else {
- params.push_back(op_a);
- params.push_back(op_b);
+ coords.push_back(op_a);
+ coords.push_back(op_b);
}
- const auto num_coords = static_cast<u32>(params.size());
- params.push_back(Immediate(static_cast<u32>(instr.tld4s.component)));
+ const auto num_coords = static_cast<u32>(coords.size());
+ coords.push_back(Immediate(static_cast<u32>(instr.tld4s.component)));
const auto& sampler =
GetSampler(instr.sampler, TextureType::Texture2D, false, depth_compare);
- MetaTexture meta{sampler, num_coords};
- WriteTexsInstructionFloat(
- bb, instr, Operation(OperationCode::F4TextureGather, meta, std::move(params)));
+ Node4 values;
+ for (u32 element = 0; element < values.size(); ++element) {
+ auto params = coords;
+ MetaTexture meta{sampler, element, num_coords};
+ values[element] =
+ Operation(OperationCode::F4TextureGather, std::move(meta), std::move(params));
+ }
+
+ WriteTexsInstructionFloat(bb, instr, values);
break;
}
case OpCode::Id::TXQ: {
@@ -314,18 +277,15 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
switch (instr.txq.query_type) {
case Tegra::Shader::TextureQueryType::Dimension: {
- MetaTexture meta_texture{sampler};
- const MetaComponents meta_components{{0, 1, 2, 3}};
-
- const Node texture = Operation(OperationCode::F4TextureQueryDimensions, meta_texture,
- GetRegister(instr.gpr8));
- std::array<Node, 4> dest;
- for (std::size_t i = 0; i < dest.size(); ++i) {
- dest[i] = GetRegister(instr.gpr0.Value() + i);
+ for (u32 element = 0; element < 4; ++element) {
+ MetaTexture meta{sampler, element};
+ const Node value = Operation(OperationCode::F4TextureQueryDimensions,
+ std::move(meta), GetRegister(instr.gpr8));
+ SetTemporal(bb, element, value);
+ }
+ for (u32 i = 0; i < 4; ++i) {
+ SetRegister(bb, instr.gpr0.Value() + i, GetTemporal(i));
}
-
- bb.push_back(Operation(OperationCode::AssignComposite, meta_components, texture,
- dest[0], dest[1], dest[2], dest[3]));
break;
}
default:
@@ -366,14 +326,17 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
texture_type = TextureType::Texture2D;
}
- MetaTexture meta_texture{sampler, static_cast<u32>(coords.size())};
- const Node texture =
- Operation(OperationCode::F4TextureQueryLod, meta_texture, std::move(coords));
+ for (u32 element = 0; element < 2; ++element) {
+ auto params = coords;
+ MetaTexture meta_texture{sampler, element, static_cast<u32>(coords.size())};
+ const Node value =
+ Operation(OperationCode::F4TextureQueryLod, meta_texture, std::move(params));
+ SetTemporal(bb, element, value);
+ }
+ for (u32 element = 0; element < 2; ++element) {
+ SetRegister(bb, instr.gpr0.Value() + element, GetTemporal(element));
+ }
- const MetaComponents meta_composite{{0, 1, 2, 3}};
- bb.push_back(Operation(OperationCode::AssignComposite, meta_composite, texture,
- GetRegister(instr.gpr0), GetRegister(instr.gpr0.Value() + 1),
- GetRegister(Register::ZeroIndex), GetRegister(Register::ZeroIndex)));
break;
}
case OpCode::Id::TLDS: {
@@ -388,8 +351,7 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, u32 pc) {
LOG_WARNING(HW_GPU, "TMML.NODEP implementation is incomplete");
}
- const Node texture = GetTldsCode(instr, texture_type, is_array);
- WriteTexsInstructionFloat(bb, instr, texture);
+ WriteTexsInstructionFloat(bb, instr, GetTldsCode(instr, texture_type, is_array));
break;
}
default:
@@ -419,57 +381,80 @@ const Sampler& ShaderIR::GetSampler(const Tegra::Shader::Sampler& sampler, Textu
return *used_samplers.emplace(entry).first;
}
-void ShaderIR::WriteTexsInstructionFloat(BasicBlock& bb, Instruction instr, Node texture) {
+void ShaderIR::WriteTexInstructionFloat(BasicBlock& bb, Instruction instr,
+ const Node4& components) {
+ u32 dest_elem = 0;
+ for (u32 elem = 0; elem < 4; ++elem) {
+ if (!instr.tex.IsComponentEnabled(elem)) {
+ // Skip disabled components
+ continue;
+ }
+ SetTemporal(bb, dest_elem++, components[elem]);
+ }
+ // After writing values in temporals, move them to the real registers
+ for (u32 i = 0; i < dest_elem; ++i) {
+ SetRegister(bb, instr.gpr0.Value() + i, GetTemporal(i));
+ }
+}
+
+void ShaderIR::WriteTexsInstructionFloat(BasicBlock& bb, Instruction instr,
+ const Node4& components) {
// TEXS has two destination registers and a swizzle. The first two elements in the swizzle
// go into gpr0+0 and gpr0+1, and the rest goes into gpr28+0 and gpr28+1
- MetaComponents meta;
- std::array<Node, 4> dest;
+ u32 dest_elem = 0;
for (u32 component = 0; component < 4; ++component) {
- if (!instr.texs.IsComponentEnabled(component)) {
+ if (!instr.texs.IsComponentEnabled(component))
continue;
- }
- meta.components_map[meta.count] = component;
+ SetTemporal(bb, dest_elem++, components[component]);
+ }
- if (meta.count < 2) {
+ for (u32 i = 0; i < dest_elem; ++i) {
+ if (i < 2) {
// Write the first two swizzle components to gpr0 and gpr0+1
- dest[meta.count] = GetRegister(instr.gpr0.Value() + meta.count % 2);
+ SetRegister(bb, instr.gpr0.Value() + i % 2, GetTemporal(i));
} else {
ASSERT(instr.texs.HasTwoDestinations());
// Write the rest of the swizzle components to gpr28 and gpr28+1
- dest[meta.count] = GetRegister(instr.gpr28.Value() + meta.count % 2);
+ SetRegister(bb, instr.gpr28.Value() + i % 2, GetTemporal(i));
}
- ++meta.count;
}
-
- std::generate(dest.begin() + meta.count, dest.end(),
- [&]() { return GetRegister(Register::ZeroIndex); });
-
- bb.push_back(Operation(OperationCode::AssignComposite, meta, texture, dest[0], dest[1], dest[2],
- dest[3]));
}
-void ShaderIR::WriteTexsInstructionHalfFloat(BasicBlock& bb, Instruction instr, Node texture) {
+void ShaderIR::WriteTexsInstructionHalfFloat(BasicBlock& bb, Instruction instr,
+ const Node4& components) {
// TEXS.F16 destionation registers are packed in two registers in pairs (just like any half
// float instruction).
- MetaComponents meta;
+ Node4 values;
+ u32 dest_elem = 0;
for (u32 component = 0; component < 4; ++component) {
if (!instr.texs.IsComponentEnabled(component))
continue;
- meta.components_map[meta.count++] = component;
+ values[dest_elem++] = components[component];
}
- if (meta.count == 0)
+ if (dest_elem == 0)
return;
- bb.push_back(Operation(OperationCode::AssignCompositeHalf, meta, texture,
- GetRegister(instr.gpr0), GetRegister(instr.gpr28)));
+ std::generate(values.begin() + dest_elem, values.end(), [&]() { return Immediate(0); });
+
+ const Node first_value = Operation(OperationCode::HPack2, values[0], values[1]);
+ if (dest_elem <= 2) {
+ SetRegister(bb, instr.gpr0, first_value);
+ return;
+ }
+
+ SetTemporal(bb, 0, first_value);
+ SetTemporal(bb, 1, Operation(OperationCode::HPack2, values[2], values[3]));
+
+ SetRegister(bb, instr.gpr0, GetTemporal(0));
+ SetRegister(bb, instr.gpr28, GetTemporal(1));
}
-Node ShaderIR::GetTextureCode(Instruction instr, TextureType texture_type,
- TextureProcessMode process_mode, bool depth_compare, bool is_array,
- std::size_t array_offset, std::size_t bias_offset,
- std::vector<Node>&& coords) {
+Node4 ShaderIR::GetTextureCode(Instruction instr, TextureType texture_type,
+ TextureProcessMode process_mode, bool depth_compare, bool is_array,
+ std::size_t array_offset, std::size_t bias_offset,
+ std::vector<Node>&& coords) {
UNIMPLEMENTED_IF_MSG(
(texture_type == TextureType::Texture3D && (is_array || depth_compare)) ||
(texture_type == TextureType::TextureCube && is_array && depth_compare),
@@ -495,24 +480,31 @@ Node ShaderIR::GetTextureCode(Instruction instr, TextureType texture_type,
std::optional<u32> array_offset_value;
if (is_array)
array_offset_value = static_cast<u32>(array_offset);
- MetaTexture meta{sampler, static_cast<u32>(coords.size()), array_offset_value};
- std::vector<Node> params = std::move(coords);
+
+ const auto coords_count = static_cast<u32>(coords.size());
if (process_mode != TextureProcessMode::None && gl_lod_supported) {
if (process_mode == TextureProcessMode::LZ) {
- params.push_back(Immediate(0.0f));
+ coords.push_back(Immediate(0.0f));
} else {
- // If present, lod or bias are always stored in the register indexed by the gpr20 field
- // with an offset depending on the usage of the other registers
- params.push_back(GetRegister(instr.gpr20.Value() + bias_offset));
+ // If present, lod or bias are always stored in the register indexed by the gpr20
+ // field with an offset depending on the usage of the other registers
+ coords.push_back(GetRegister(instr.gpr20.Value() + bias_offset));
}
}
- return Operation(read_method, meta, std::move(params));
+ Node4 values;
+ for (u32 element = 0; element < values.size(); ++element) {
+ auto params = coords;
+ MetaTexture meta{sampler, element, coords_count, array_offset_value};
+ values[element] = Operation(read_method, std::move(meta), std::move(params));
+ }
+
+ return values;
}
-Node ShaderIR::GetTexCode(Instruction instr, TextureType texture_type,
- TextureProcessMode process_mode, bool depth_compare, bool is_array) {
+Node4 ShaderIR::GetTexCode(Instruction instr, TextureType texture_type,
+ TextureProcessMode process_mode, bool depth_compare, bool is_array) {
const bool lod_bias_enabled =
(process_mode != TextureProcessMode::None && process_mode != TextureProcessMode::LZ);
@@ -551,8 +543,8 @@ Node ShaderIR::GetTexCode(Instruction instr, TextureType texture_type,
0, std::move(coords));
}
-Node ShaderIR::GetTexsCode(Instruction instr, TextureType texture_type,
- TextureProcessMode process_mode, bool depth_compare, bool is_array) {
+Node4 ShaderIR::GetTexsCode(Instruction instr, TextureType texture_type,
+ TextureProcessMode process_mode, bool depth_compare, bool is_array) {
const bool lod_bias_enabled =
(process_mode != TextureProcessMode::None && process_mode != TextureProcessMode::LZ);
@@ -593,8 +585,8 @@ Node ShaderIR::GetTexsCode(Instruction instr, TextureType texture_type,
(coord_count > 2 ? 1 : 0), std::move(coords));
}
-Node ShaderIR::GetTld4Code(Instruction instr, TextureType texture_type, bool depth_compare,
- bool is_array) {
+Node4 ShaderIR::GetTld4Code(Instruction instr, TextureType texture_type, bool depth_compare,
+ bool is_array) {
const std::size_t coord_count = GetCoordCount(texture_type);
const std::size_t total_coord_count = coord_count + (is_array ? 1 : 0);
const std::size_t total_reg_count = total_coord_count + (depth_compare ? 1 : 0);
@@ -604,24 +596,31 @@ Node ShaderIR::GetTld4Code(Instruction instr, TextureType texture_type, bool dep
// First coordinate index is the gpr8 or gpr8 + 1 when arrays are used
const u64 coord_register = array_register + (is_array ? 1 : 0);
- std::vector<Node> params;
+ std::vector<Node> coords;
for (size_t i = 0; i < coord_count; ++i) {
- params.push_back(GetRegister(coord_register + i));
+ coords.push_back(GetRegister(coord_register + i));
}
std::optional<u32> array_offset;
if (is_array) {
- array_offset = static_cast<u32>(params.size());
- params.push_back(GetRegister(array_register));
+ array_offset = static_cast<u32>(coords.size());
+ coords.push_back(GetRegister(array_register));
}
const auto& sampler = GetSampler(instr.sampler, texture_type, is_array, depth_compare);
- MetaTexture meta{sampler, static_cast<u32>(params.size()), array_offset};
- return Operation(OperationCode::F4TextureGather, std::move(meta), std::move(params));
+ Node4 values;
+ for (u32 element = 0; element < values.size(); ++element) {
+ auto params = coords;
+ MetaTexture meta{sampler, element, static_cast<u32>(coords.size()), array_offset};
+ values[element] =
+ Operation(OperationCode::F4TextureGather, std::move(meta), std::move(params));
+ }
+
+ return values;
}
-Node ShaderIR::GetTldsCode(Instruction instr, TextureType texture_type, bool is_array) {
+Node4 ShaderIR::GetTldsCode(Instruction instr, TextureType texture_type, bool is_array) {
const std::size_t type_coord_count = GetCoordCount(texture_type);
const std::size_t total_coord_count = type_coord_count + (is_array ? 1 : 0);
const bool lod_enabled = instr.tlds.GetTextureProcessMode() == TextureProcessMode::LL;
@@ -636,36 +635,41 @@ Node ShaderIR::GetTldsCode(Instruction instr, TextureType texture_type, bool is_
? static_cast<u64>(instr.gpr20.Value())
: coord_register + 1;
- std::vector<Node> params;
+ std::vector<Node> coords;
for (std::size_t i = 0; i < type_coord_count; ++i) {
const bool last = (i == (type_coord_count - 1)) && (type_coord_count > 1);
- params.push_back(GetRegister(last ? last_coord_register : coord_register + i));
+ coords.push_back(GetRegister(last ? last_coord_register : coord_register + i));
}
std::optional<u32> array_offset;
if (is_array) {
- array_offset = static_cast<u32>(params.size());
- params.push_back(GetRegister(array_register));
+ array_offset = static_cast<u32>(coords.size());
+ coords.push_back(GetRegister(array_register));
}
- const auto coords_count = static_cast<u32>(params.size());
+ const auto coords_count = static_cast<u32>(coords.size());
if (lod_enabled) {
// When lod is used always is in grp20
- params.push_back(GetRegister(instr.gpr20));
+ coords.push_back(GetRegister(instr.gpr20));
} else {
- params.push_back(Immediate(0));
+ coords.push_back(Immediate(0));
}
const auto& sampler = GetSampler(instr.sampler, texture_type, is_array, false);
- MetaTexture meta{sampler, coords_count, array_offset};
- return Operation(OperationCode::F4TexelFetch, std::move(meta), std::move(params));
+ Node4 values;
+ for (u32 element = 0; element < values.size(); ++element) {
+ auto params = coords;
+ MetaTexture meta{sampler, element, coords_count, array_offset};
+ values[element] =
+ Operation(OperationCode::F4TexelFetch, std::move(meta), std::move(params));
+ }
+ return values;
}
std::tuple<std::size_t, std::size_t> ShaderIR::ValidateAndGetCoordinateElement(
TextureType texture_type, bool depth_compare, bool is_array, bool lod_bias_enabled,
std::size_t max_coords, std::size_t max_inputs) {
-
const std::size_t coord_count = GetCoordCount(texture_type);
std::size_t total_coord_count = coord_count + (is_array ? 1 : 0) + (depth_compare ? 1 : 0);
diff --git a/src/video_core/shader/shader_ir.cpp b/src/video_core/shader/shader_ir.cpp
index d4e304b4e..4474af7c4 100644
--- a/src/video_core/shader/shader_ir.cpp
+++ b/src/video_core/shader/shader_ir.cpp
@@ -121,6 +121,10 @@ Node ShaderIR::GetLocalMemory(Node address) {
return StoreNode(LmemNode(address));
}
+Node ShaderIR::GetTemporal(u32 id) {
+ return GetRegister(Register::ZeroIndex + 1 + id);
+}
+
Node ShaderIR::GetOperandAbsNegFloat(Node value, bool absolute, bool negate) {
if (absolute) {
value = Operation(OperationCode::FAbsolute, NO_PRECISE, value);
@@ -348,6 +352,10 @@ void ShaderIR::SetLocalMemory(BasicBlock& bb, Node address, Node value) {
bb.push_back(Operation(OperationCode::Assign, GetLocalMemory(address), value));
}
+void ShaderIR::SetTemporal(BasicBlock& bb, u32 id, Node value) {
+ SetRegister(bb, Register::ZeroIndex + 1 + id, value);
+}
+
Node ShaderIR::BitfieldExtract(Node value, u32 offset, u32 bits) {
return Operation(OperationCode::UBitfieldExtract, NO_PRECISE, value, Immediate(offset),
Immediate(bits));
diff --git a/src/video_core/shader/shader_ir.h b/src/video_core/shader/shader_ir.h
index b8bec0d9e..0c8f4a265 100644
--- a/src/video_core/shader/shader_ir.h
+++ b/src/video_core/shader/shader_ir.h
@@ -4,6 +4,7 @@
#pragma once
+#include <array>
#include <cstring>
#include <map>
#include <set>
@@ -37,17 +38,15 @@ using NodeData =
std::variant<OperationNode, ConditionalNode, GprNode, ImmediateNode, InternalFlagNode,
PredicateNode, AbufNode, CbufNode, LmemNode, GmemNode, CommentNode>;
using Node = const NodeData*;
+using Node4 = std::array<Node, 4>;
using BasicBlock = std::vector<Node>;
constexpr u32 MAX_PROGRAM_LENGTH = 0x1000;
enum class OperationCode {
- Assign, /// (float& dest, float src) -> void
- AssignComposite, /// (MetaComponents, float4 src, float&[4] dst) -> void
- AssignCompositeHalf, /// (MetaComponents, float4 src, float&[2] dst) -> void
+ Assign, /// (float& dest, float src) -> void
- Composite, /// (float[4] values) -> float4
- Select, /// (MetaArithmetic, bool pred, float a, float b) -> float
+ Select, /// (MetaArithmetic, bool pred, float a, float b) -> float
FAdd, /// (MetaArithmetic, float a, float b) -> float
FMul, /// (MetaArithmetic, float a, float b) -> float
@@ -117,6 +116,7 @@ enum class OperationCode {
HMergeF32, /// (f16vec2 src) -> float
HMergeH0, /// (f16vec2 dest, f16vec2 src) -> f16vec2
HMergeH1, /// (f16vec2 dest, f16vec2 src) -> f16vec2
+ HPack2, /// (float a, float b) -> f16vec2
LogicalAssign, /// (bool& dst, bool src) -> void
LogicalAnd, /// (bool a, bool b) -> bool
@@ -270,24 +270,16 @@ struct MetaHalfArithmetic {
struct MetaTexture {
const Sampler& sampler;
+ u32 element{};
u32 coords_count{};
std::optional<u32> array_index;
};
-struct MetaComponents {
- std::array<u32, 4> components_map{};
- u32 count{};
-
- u32 GetSourceComponent(u32 dest_index) const {
- return components_map[dest_index];
- }
-};
-
constexpr MetaArithmetic PRECISE = {true};
constexpr MetaArithmetic NO_PRECISE = {false};
constexpr MetaHalfArithmetic HALF_NO_PRECISE = {false};
-using Meta = std::variant<MetaArithmetic, MetaHalfArithmetic, MetaTexture, MetaComponents>;
+using Meta = std::variant<MetaArithmetic, MetaHalfArithmetic, MetaTexture>;
/// Holds any kind of operation that can be done in the IR
class OperationNode final {
@@ -643,6 +635,8 @@ private:
Node GetInternalFlag(InternalFlag flag, bool negated = false);
/// Generates a node representing a local memory address
Node GetLocalMemory(Node address);
+ /// Generates a temporal, internally it uses a post-RZ register
+ Node GetTemporal(u32 id);
/// Sets a register. src value must be a number-evaluated node.
void SetRegister(BasicBlock& bb, Tegra::Shader::Register dest, Node src);
@@ -652,6 +646,8 @@ private:
void SetInternalFlag(BasicBlock& bb, InternalFlag flag, Node value);
/// Sets a local memory address. address and value must be a number-evaluated node
void SetLocalMemory(BasicBlock& bb, Node address, Node value);
+ /// Sets a temporal. Internally it uses a post-RZ register
+ void SetTemporal(BasicBlock& bb, u32 id, Node value);
/// Conditionally absolute/negated float. Absolute is applied first
Node GetOperandAbsNegFloat(Node value, bool absolute, bool negate);
@@ -692,32 +688,36 @@ private:
/// Extracts a sequence of bits from a node
Node BitfieldExtract(Node value, u32 offset, u32 bits);
- void WriteTexsInstructionFloat(BasicBlock& bb, Tegra::Shader::Instruction instr, Node texture);
- void WriteTexsInstructionHalfFloat(BasicBlock& bb, Tegra::Shader::Instruction instr,
- Node texture);
+ void WriteTexInstructionFloat(BasicBlock& bb, Tegra::Shader::Instruction instr,
+ const Node4& components);
- Node GetTexCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
- Tegra::Shader::TextureProcessMode process_mode, bool depth_compare,
- bool is_array);
+ void WriteTexsInstructionFloat(BasicBlock& bb, Tegra::Shader::Instruction instr,
+ const Node4& components);
+ void WriteTexsInstructionHalfFloat(BasicBlock& bb, Tegra::Shader::Instruction instr,
+ const Node4& components);
- Node GetTexsCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
+ Node4 GetTexCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
Tegra::Shader::TextureProcessMode process_mode, bool depth_compare,
bool is_array);
- Node GetTld4Code(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
- bool depth_compare, bool is_array);
+ Node4 GetTexsCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
+ Tegra::Shader::TextureProcessMode process_mode, bool depth_compare,
+ bool is_array);
- Node GetTldsCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
- bool is_array);
+ Node4 GetTld4Code(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
+ bool depth_compare, bool is_array);
+
+ Node4 GetTldsCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
+ bool is_array);
std::tuple<std::size_t, std::size_t> ValidateAndGetCoordinateElement(
Tegra::Shader::TextureType texture_type, bool depth_compare, bool is_array,
bool lod_bias_enabled, std::size_t max_coords, std::size_t max_inputs);
- Node GetTextureCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
- Tegra::Shader::TextureProcessMode process_mode, bool depth_compare,
- bool is_array, std::size_t array_offset, std::size_t bias_offset,
- std::vector<Node>&& coords);
+ Node4 GetTextureCode(Tegra::Shader::Instruction instr, Tegra::Shader::TextureType texture_type,
+ Tegra::Shader::TextureProcessMode process_mode, bool depth_compare,
+ bool is_array, std::size_t array_offset, std::size_t bias_offset,
+ std::vector<Node>&& coords);
Node GetVideoOperand(Node op, bool is_chunk, bool is_signed, Tegra::Shader::VideoType type,
u64 byte_height);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 18:08:39 +0200