diff options
author | bunnei <bunneidev@gmail.com> | 2020-02-03 06:25:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 06:25:56 +0100 |
commit | 157eb375a59029d9d515d37bc9dc4370890bb3e9 (patch) | |
tree | 8f2a211c419e7446cc162a83b348132fcf478624 | |
parent | Merge pull request #3282 from FernandoS27/indexed-samplers (diff) | |
parent | shader: Remove curly braces initializers on shared pointers (diff) | |
download | yuzu-157eb375a59029d9d515d37bc9dc4370890bb3e9.tar yuzu-157eb375a59029d9d515d37bc9dc4370890bb3e9.tar.gz yuzu-157eb375a59029d9d515d37bc9dc4370890bb3e9.tar.bz2 yuzu-157eb375a59029d9d515d37bc9dc4370890bb3e9.tar.lz yuzu-157eb375a59029d9d515d37bc9dc4370890bb3e9.tar.xz yuzu-157eb375a59029d9d515d37bc9dc4370890bb3e9.tar.zst yuzu-157eb375a59029d9d515d37bc9dc4370890bb3e9.zip |
-rw-r--r-- | src/video_core/shader/ast.h | 10 | ||||
-rw-r--r-- | src/video_core/shader/decode/arithmetic_integer.cpp | 2 | ||||
-rw-r--r-- | src/video_core/shader/decode/texture.cpp | 4 | ||||
-rw-r--r-- | src/video_core/shader/node.h | 4 | ||||
-rw-r--r-- | src/video_core/shader/track.cpp | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/video_core/shader/ast.h b/src/video_core/shader/ast.h index a2f0044ba..cca13bcde 100644 --- a/src/video_core/shader/ast.h +++ b/src/video_core/shader/ast.h @@ -65,8 +65,8 @@ public: void DetachSegment(ASTNode start, ASTNode end); void Remove(ASTNode node); - ASTNode first{}; - ASTNode last{}; + ASTNode first; + ASTNode last; }; class ASTProgram { @@ -299,9 +299,9 @@ private: friend class ASTZipper; ASTData data; - ASTNode parent{}; - ASTNode next{}; - ASTNode previous{}; + ASTNode parent; + ASTNode next; + ASTNode previous; ASTZipper* manager{}; }; diff --git a/src/video_core/shader/decode/arithmetic_integer.cpp b/src/video_core/shader/decode/arithmetic_integer.cpp index 371fae127..e60875cc4 100644 --- a/src/video_core/shader/decode/arithmetic_integer.cpp +++ b/src/video_core/shader/decode/arithmetic_integer.cpp @@ -297,7 +297,7 @@ void ShaderIR::WriteLop3Instruction(NodeBlock& bb, Register dest, Node op_a, Nod const Node one = Immediate(1); const Node two = Immediate(2); - Node value{}; + Node value; for (u32 i = 0; i < lop_iterations; ++i) { const Node shift_amount = Immediate(i); diff --git a/src/video_core/shader/decode/texture.cpp b/src/video_core/shader/decode/texture.cpp index d980535b1..351c8c2f1 100644 --- a/src/video_core/shader/decode/texture.cpp +++ b/src/video_core/shader/decode/texture.cpp @@ -630,7 +630,7 @@ Node4 ShaderIR::GetTexCode(Instruction instr, TextureType texture_type, aoffi = GetAoffiCoordinates(GetRegister(parameter_register++), coord_count, false); } - Node dc{}; + Node dc; if (depth_compare) { // Depth is always stored in the register signaled by gpr20 or in the next register if lod // or bias are used @@ -666,7 +666,7 @@ Node4 ShaderIR::GetTexsCode(Instruction instr, TextureType texture_type, const Node array = is_array ? GetRegister(array_register) : nullptr; - Node dc{}; + Node dc; if (depth_compare) { // Depth is always stored in the register signaled by gpr20 or in the next register if lod // or bias are used diff --git a/src/video_core/shader/node.h b/src/video_core/shader/node.h index 5f83403db..a0a7b9111 100644 --- a/src/video_core/shader/node.h +++ b/src/video_core/shader/node.h @@ -443,9 +443,9 @@ struct MetaTexture { std::vector<Node> derivates; Node bias; Node lod; - Node component{}; + Node component; u32 element{}; - Node index{}; + Node index; }; struct MetaImage { diff --git a/src/video_core/shader/track.cpp b/src/video_core/shader/track.cpp index ea39bca54..face8c943 100644 --- a/src/video_core/shader/track.cpp +++ b/src/video_core/shader/track.cpp @@ -41,8 +41,8 @@ std::optional<std::pair<Node, Node>> DecoupleIndirectRead(const OperationNode& o if (operation.GetCode() != OperationCode::UAdd) { return std::nullopt; } - Node gpr{}; - Node offset{}; + Node gpr; + Node offset; ASSERT(operation.GetOperandsCount() == 2); for (std::size_t i = 0; i < operation.GetOperandsCount(); i++) { Node operand = operation[i]; |