yuzu-emu/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-27 21:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4891 from lioncash/clang2

Browse Source 
General: Fix clang build
This commit is contained in:
bunnei 2020-11-06 10:33:13 -08:00 committed by GitHub
commit 91a45834fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/fiber.h
View File

@ -41,8 +41,8 @@ public:
Fiber(const Fiber&) = delete; Fiber(const Fiber&) = delete;
Fiber& operator=(const Fiber&) = delete; Fiber& operator=(const Fiber&) = delete;
Fiber(Fiber&&) = default; Fiber(Fiber&&) = delete;
Fiber& operator=(Fiber&&) = default; Fiber& operator=(Fiber&&) = delete;
/// Yields control from Fiber 'from' to Fiber 'to' /// Yields control from Fiber 'from' to Fiber 'to'
/// Fiber 'from' must be the currently running fiber. /// Fiber 'from' must be the currently running fiber.

8
src/common/spin_lock.h
View File

@ -15,6 +15,14 @@ namespace Common {
*/ */
class SpinLock { class SpinLock {
public: public:
SpinLock() = default;
SpinLock(const SpinLock&) = delete;
SpinLock& operator=(const SpinLock&) = delete;
SpinLock(SpinLock&&) = delete;
SpinLock& operator=(SpinLock&&) = delete;
void lock(); void lock();
void unlock(); void unlock();
[[nodiscard]] bool try_lock(); [[nodiscard]] bool try_lock();

7
src/video_core/dma_pusher.h
View File

@ -18,6 +18,8 @@ class System;
namespace Tegra { namespace Tegra {
class GPU;
enum class SubmissionMode : u32 { enum class SubmissionMode : u32 {
IncreasingOld = 0, IncreasingOld = 0,
Increasing = 1, Increasing = 1,
@ -74,8 +76,7 @@ union CommandHeader {
static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout"); static_assert(std::is_standard_layout_v<CommandHeader>, "CommandHeader is not standard layout");
static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!");
static constexpr CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_count, inline CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_count, SubmissionMode mode) {
SubmissionMode mode) {
CommandHeader result{}; CommandHeader result{};
result.method.Assign(static_cast<u32>(method)); result.method.Assign(static_cast<u32>(method));
result.arg_count.Assign(arg_count); result.arg_count.Assign(arg_count);
@ -83,8 +84,6 @@ static constexpr CommandHeader BuildCommandHeader(BufferMethods method, u32 arg_
return result; return result;
} }
class GPU;
struct CommandList final { struct CommandList final {
CommandList() = default; CommandList() = default;
explicit CommandList(std::size_t size) : command_lists(size) {} explicit CommandList(std::size_t size) : command_lists(size) {}

2
src/video_core/gpu.h
View File

@ -273,7 +273,7 @@ public:
BitField<0, 1, FenceOperation> op; BitField<0, 1, FenceOperation> op;
BitField<8, 24, u32> syncpoint_id; 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{}; FenceAction result{};
result.op.Assign(op); result.op.Assign(op);
result.syncpoint_id.Assign(syncpoint_id); result.syncpoint_id.Assign(syncpoint_id);