diff options
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/dma_pusher.h | 7 | ||||
| -rw-r--r-- | src/video_core/gpu.h | 2 |
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; namespace Tegra { +class GPU; + enum class SubmissionMode : u32 { IncreasingOld = 0, Increasing = 1, @@ -74,8 +76,7 @@ union CommandHeader { static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout"); static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); -static constexpr CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_count, - SubmissionMode mode) { +inline CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_count, SubmissionMode mode) { CommandHeader result{}; result.method.Assign(static_cast<u32>(method)); result.arg_count.Assign(arg_count); @@ -83,8 +84,6 @@ static constexpr CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_ return result; } -class GPU; - struct CommandList final { CommandList() = default; 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: BitField<0, 1, FenceOperation> op; BitField<8, 24, u32> syncpoint_id; - static constexpr CommandHeader Build(FenceOperation op, u32 syncpoint_id) { + static CommandHeader Build(FenceOperation op, u32 syncpoint_id) { FenceAction result{}; result.op.Assign(op); result.syncpoint_id.Assign(syncpoint_id); |