Browse Source
Merge pull request #3370 from ReinUsesLisp/node-shared-ptr
shader: Remove curly braces initializers on shared pointers
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
12 additions and
12 deletions
-
src/video_core/shader/ast.h
-
src/video_core/shader/decode/arithmetic_integer.cpp
-
src/video_core/shader/decode/texture.cpp
-
src/video_core/shader/node.h
-
src/video_core/shader/track.cpp
|
|
|
@ -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{}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -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); |
|
|
|
|
|
|
|
|
|
|
|
@ -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
|
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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]; |
|
|
|
|