mirror of
https://git.h3cjp.net/H3cJP/yuzu.git
synced 2024-11-15 15:52:51 +00:00
Merge pull request #3786 from degasus/fix_warnings
Fix -Werror=conversion and -Wdeprecated-copy issues
This commit is contained in:
commit
6ec965ef91
|
@ -180,7 +180,7 @@ public:
|
|||
}
|
||||
|
||||
constexpr void Assign(const T& value) {
|
||||
storage = (static_cast<StorageType>(storage) & ~mask) | FormatValue(value);
|
||||
storage = static_cast<StorageType>((storage & ~mask) | FormatValue(value));
|
||||
}
|
||||
|
||||
constexpr T Value() const {
|
||||
|
|
|
@ -655,6 +655,7 @@ union Instruction {
|
|||
}
|
||||
|
||||
constexpr Instruction(u64 value) : value{value} {}
|
||||
constexpr Instruction(const Instruction& instr) : value(instr.value) {}
|
||||
|
||||
BitField<0, 8, Register> gpr0;
|
||||
BitField<8, 8, Register> gpr8;
|
||||
|
|
|
@ -129,7 +129,7 @@ struct alignas(32) FixedPipelineState {
|
|||
auto& binding = bindings[index];
|
||||
binding.raw = 0;
|
||||
binding.enabled.Assign(enabled ? 1 : 0);
|
||||
binding.stride.Assign(stride);
|
||||
binding.stride.Assign(static_cast<u16>(stride));
|
||||
binding_divisors[index] = divisor;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue