summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2020-02-01 22:49:25 -0300
committerGravatar ReinUsesLisp2020-02-01 22:52:10 -0300
commit223a89a19f7cd904c79c4070498c5941bcdf0724 (patch)
tree8f2a211c419e7446cc162a83b348132fcf478624
parentMerge pull request #3282 from FernandoS27/indexed-samplers (diff)
downloadyuzu-223a89a19f7cd904c79c4070498c5941bcdf0724.tar.gz
yuzu-223a89a19f7cd904c79c4070498c5941bcdf0724.tar.xz
yuzu-223a89a19f7cd904c79c4070498c5941bcdf0724.zip
shader: Remove curly braces initializers on shared pointers
-rw-r--r--src/video_core/shader/ast.h10
-rw-r--r--src/video_core/shader/decode/arithmetic_integer.cpp2
-rw-r--r--src/video_core/shader/decode/texture.cpp4
-rw-r--r--src/video_core/shader/node.h4
-rw-r--r--src/video_core/shader/track.cpp4
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:
65 void DetachSegment(ASTNode start, ASTNode end); 65 void DetachSegment(ASTNode start, ASTNode end);
66 void Remove(ASTNode node); 66 void Remove(ASTNode node);
67 67
68 ASTNode first{}; 68 ASTNode first;
69 ASTNode last{}; 69 ASTNode last;
70}; 70};
71 71
72class ASTProgram { 72class ASTProgram {
@@ -299,9 +299,9 @@ private:
299 friend class ASTZipper; 299 friend class ASTZipper;
300 300
301 ASTData data; 301 ASTData data;
302 ASTNode parent{}; 302 ASTNode parent;
303 ASTNode next{}; 303 ASTNode next;
304 ASTNode previous{}; 304 ASTNode previous;
305 ASTZipper* manager{}; 305 ASTZipper* manager{};
306}; 306};
307 307
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
297 const Node one = Immediate(1); 297 const Node one = Immediate(1);
298 const Node two = Immediate(2); 298 const Node two = Immediate(2);
299 299
300 Node value{}; 300 Node value;
301 for (u32 i = 0; i < lop_iterations; ++i) { 301 for (u32 i = 0; i < lop_iterations; ++i) {
302 const Node shift_amount = Immediate(i); 302 const Node shift_amount = Immediate(i);
303 303
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,
630 aoffi = GetAoffiCoordinates(GetRegister(parameter_register++), coord_count, false); 630 aoffi = GetAoffiCoordinates(GetRegister(parameter_register++), coord_count, false);
631 } 631 }
632 632
633 Node dc{}; 633 Node dc;
634 if (depth_compare) { 634 if (depth_compare) {
635 // Depth is always stored in the register signaled by gpr20 or in the next register if lod 635 // Depth is always stored in the register signaled by gpr20 or in the next register if lod
636 // or bias are used 636 // or bias are used
@@ -666,7 +666,7 @@ Node4 ShaderIR::GetTexsCode(Instruction instr, TextureType texture_type,
666 666
667 const Node array = is_array ? GetRegister(array_register) : nullptr; 667 const Node array = is_array ? GetRegister(array_register) : nullptr;
668 668
669 Node dc{}; 669 Node dc;
670 if (depth_compare) { 670 if (depth_compare) {
671 // Depth is always stored in the register signaled by gpr20 or in the next register if lod 671 // Depth is always stored in the register signaled by gpr20 or in the next register if lod
672 // or bias are used 672 // 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 {
443 std::vector<Node> derivates; 443 std::vector<Node> derivates;
444 Node bias; 444 Node bias;
445 Node lod; 445 Node lod;
446 Node component{}; 446 Node component;
447 u32 element{}; 447 u32 element{};
448 Node index{}; 448 Node index;
449}; 449};
450 450
451struct MetaImage { 451struct 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
41 if (operation.GetCode() != OperationCode::UAdd) { 41 if (operation.GetCode() != OperationCode::UAdd) {
42 return std::nullopt; 42 return std::nullopt;
43 } 43 }
44 Node gpr{}; 44 Node gpr;
45 Node offset{}; 45 Node offset;
46 ASSERT(operation.GetOperandsCount() == 2); 46 ASSERT(operation.GetOperandsCount() == 2);
47 for (std::size_t i = 0; i < operation.GetOperandsCount(); i++) { 47 for (std::size_t i = 0; i < operation.GetOperandsCount(); i++) {
48 Node operand = operation[i]; 48 Node operand = operation[i];