summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Lioncash2020-11-04 20:41:16 -0500
committerGravatar Lioncash2020-11-05 10:07:16 -0500
commit6f006d051e1fad075048ea5664e1ef0605e48a46 (patch)
tree47fbdd1225fabbd0c1abb05bb8ebd5a02632ce02 /src/video_core
parentMerge pull request #4889 from lioncash/setting-global (diff)
downloadyuzu-6f006d051e1fad075048ea5664e1ef0605e48a46.tar.gz
yuzu-6f006d051e1fad075048ea5664e1ef0605e48a46.tar.xz
yuzu-6f006d051e1fad075048ea5664e1ef0605e48a46.zip
General: Fix clang build
Allows building on clang to work again
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/dma_pusher.h7
-rw-r--r--src/video_core/gpu.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/dma_pusher.h b/src/video_core/dma_pusher.h
index 8496ba2da..9d9a750d9 100644
--- a/src/video_core/dma_pusher.h
+++ b/src/video_core/dma_pusher.h
@@ -18,6 +18,8 @@ class System;
18 18
19namespace Tegra { 19namespace Tegra {
20 20
21class GPU;
22
21enum class SubmissionMode : u32 { 23enum class SubmissionMode : u32 {
22 IncreasingOld = 0, 24 IncreasingOld = 0,
23 Increasing = 1, 25 Increasing = 1,
@@ -74,8 +76,7 @@ union CommandHeader {
74static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout"); 76static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout");
75static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); 77static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!");
76 78
77static constexpr CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_count, 79inline CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_count, SubmissionMode mode) {
78 SubmissionMode mode) {
79 CommandHeader result{}; 80 CommandHeader result{};
80 result.method.Assign(static_cast<u32>(method)); 81 result.method.Assign(static_cast<u32>(method));
81 result.arg_count.Assign(arg_count); 82 result.arg_count.Assign(arg_count);
@@ -83,8 +84,6 @@ static constexpr CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_
83 return result; 84 return result;
84} 85}
85 86
86class GPU;
87
88struct CommandList final { 87struct CommandList final {
89 CommandList() = default; 88 CommandList() = default;
90 explicit CommandList(std::size_t size) : command_lists(size) {} 89 explicit CommandList(std::size_t size) : command_lists(size) {}
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index 5444b49f3..cf5235a79 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -273,7 +273,7 @@ public:
273 BitField<0, 1, FenceOperation> op; 273 BitField<0, 1, FenceOperation> op;
274 BitField<8, 24, u32> syncpoint_id; 274 BitField<8, 24, u32> syncpoint_id;
275 275
276 static constexpr CommandHeader Build(FenceOperation op, u32 syncpoint_id) { 276 static CommandHeader Build(FenceOperation op, u32 syncpoint_id) {
277 FenceAction result{}; 277 FenceAction result{};
278 result.op.Assign(op); 278 result.op.Assign(op);
279 result.syncpoint_id.Assign(syncpoint_id); 279 result.syncpoint_id.Assign(syncpoint_id);