diff options
| author | 2020-11-04 20:41:16 -0500 | |
|---|---|---|
| committer | 2020-11-05 10:07:16 -0500 | |
| commit | 6f006d051e1fad075048ea5664e1ef0605e48a46 (patch) | |
| tree | 47fbdd1225fabbd0c1abb05bb8ebd5a02632ce02 /src/video_core/dma_pusher.h | |
| parent | Merge pull request #4889 from lioncash/setting-global (diff) | |
| download | yuzu-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/dma_pusher.h')
| -rw-r--r-- | src/video_core/dma_pusher.h | 7 |
1 files changed, 3 insertions, 4 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 | ||
| 19 | namespace Tegra { | 19 | namespace Tegra { |
| 20 | 20 | ||
| 21 | class GPU; | ||
| 22 | |||
| 21 | enum class SubmissionMode : u32 { | 23 | enum class SubmissionMode : u32 { |
| 22 | IncreasingOld = 0, | 24 | IncreasingOld = 0, |
| 23 | Increasing = 1, | 25 | Increasing = 1, |
| @@ -74,8 +76,7 @@ union CommandHeader { | |||
| 74 | static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout"); | 76 | static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout"); |
| 75 | static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); | 77 | static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); |
| 76 | 78 | ||
| 77 | static constexpr CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_count, | 79 | inline 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 | ||
| 86 | class GPU; | ||
| 87 | |||
| 88 | struct CommandList final { | 87 | struct 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) {} |