summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-11-18 12:34:34 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2019-11-18 12:34:34 +0100
commitc8473f399e745993d2b9980f4ef62fa6a208ec3d (patch)
treeaf8d64c9a361cb600ec2521f05b5faef0bb76da0 /src/video_core/shader
parentShader_IR: Implement TXD instruction. (diff)
downloadyuzu-c8473f399e745993d2b9980f4ef62fa6a208ec3d.tar
yuzu-c8473f399e745993d2b9980f4ef62fa6a208ec3d.tar.gz
yuzu-c8473f399e745993d2b9980f4ef62fa6a208ec3d.tar.bz2
yuzu-c8473f399e745993d2b9980f4ef62fa6a208ec3d.tar.lz
yuzu-c8473f399e745993d2b9980f4ef62fa6a208ec3d.tar.xz
yuzu-c8473f399e745993d2b9980f4ef62fa6a208ec3d.tar.zst
yuzu-c8473f399e745993d2b9980f4ef62fa6a208ec3d.zip
Diffstat (limited to 'src/video_core/shader')
-rw-r--r--src/video_core/shader/decode/arithmetic_integer.cpp11
-rw-r--r--src/video_core/shader/decode/texture.cpp7
2 files changed, 8 insertions, 10 deletions
diff --git a/src/video_core/shader/decode/arithmetic_integer.cpp b/src/video_core/shader/decode/arithmetic_integer.cpp
index 9208b7bef..371fae127 100644
--- a/src/video_core/shader/decode/arithmetic_integer.cpp
+++ b/src/video_core/shader/decode/arithmetic_integer.cpp
@@ -135,17 +135,18 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) {
case OpCode::Id::FLO_IMM: {
Node value;
if (instr.flo.invert) {
- op_b = Operation(OperationCode::IBitwiseNot, NO_PRECISE, op_b);
+ op_b = Operation(OperationCode::IBitwiseNot, NO_PRECISE, std::move(op_b));
}
if (instr.flo.is_signed) {
- value = Operation(OperationCode::IBitMSB, NO_PRECISE, op_b);
+ value = Operation(OperationCode::IBitMSB, NO_PRECISE, std::move(op_b));
} else {
- value = Operation(OperationCode::UBitMSB, NO_PRECISE, op_b);
+ value = Operation(OperationCode::UBitMSB, NO_PRECISE, std::move(op_b));
}
if (instr.flo.sh) {
- value = Operation(OperationCode::UBitwiseXor, NO_PRECISE, value, Immediate(31));
+ value =
+ Operation(OperationCode::UBitwiseXor, NO_PRECISE, std::move(value), Immediate(31));
}
- SetRegister(bb, instr.gpr0, value);
+ SetRegister(bb, instr.gpr0, std::move(value));
break;
}
case OpCode::Id::SEL_C:
diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp
index 0e501919d..9afba2495 100644
--- a/src/video_core/shader/decode/texture.cpp
+++ b/src/video_core/shader/decode/texture.cpp
@@ -147,8 +147,7 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) {
case OpCode::Id::TXD: {
UNIMPLEMENTED_IF_MSG(instr.txd.UsesMiscMode(TextureMiscMode::AOFFI),
"AOFFI is not implemented");
- const auto is_array = static_cast<bool>(instr.txd.is_array != 0);
- UNIMPLEMENTED_IF_MSG(is_array, "TXD Array is not implemented");
+ UNIMPLEMENTED_IF_MSG(instr.txd.is_array != 0, "TXD Array is not implemented");
u64 base_reg = instr.gpr8.Value();
const auto derivate_reg = instr.gpr20.Value();
@@ -173,10 +172,8 @@ u32 ShaderIR::DecodeTexture(NodeBlock& bb, u32 pc) {
Node4 values;
for (u32 element = 0; element < values.size(); ++element) {
- auto coords_copy = coords;
MetaTexture meta{sampler, {}, {}, {}, derivates, {}, {}, {}, element};
- values[element] =
- Operation(OperationCode::TextureGradient, meta, std::move(coords_copy));
+ values[element] = Operation(OperationCode::TextureGradient, std::move(meta), coords);
}
WriteTexInstructionFloat(bb, instr, values);