From 223a89a19f7cd904c79c4070498c5941bcdf0724 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Sat, 1 Feb 2020 22:49:25 -0300 Subject: [PATCH] shader: Remove curly braces initializers on shared pointers --- src/video_core/shader/ast.h | 10 +++++----- src/video_core/shader/decode/arithmetic_integer.cpp | 2 +- src/video_core/shader/decode/texture.cpp | 4 ++-- src/video_core/shader/node.h | 4 ++-- 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 a2f0044ba8..cca13bcdec 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 371fae1277..e60875cc48 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 d980535b1c..351c8c2f19 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 5f83403db3..a0a7b91115 100644 --- a/src/video_core/shader/node.h +++ b/src/video_core/shader/node.h @@ -443,9 +443,9 @@ struct MetaTexture { std::vector 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 ea39bca54e..face8c9438 100644 --- a/src/video_core/shader/track.cpp +++ b/src/video_core/shader/track.cpp @@ -41,8 +41,8 @@ std::optional> 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];