yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #3786 from degasus/fix_warnings 

Fix -Werror=conversion and -Wdeprecated-copy issues
This commit is contained in:
Zach Hilman 2020-04-24 08:54:45 -04:00 committed by GitHub
parent 8f548266cd e717a1df20
commit 6ec965ef91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/bit_field.h
View File

@ -180,7 +180,7 @@ public:
} }
constexpr void Assign(const T& value) { 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 { constexpr T Value() const {

1
src/video_core/engines/shader_bytecode.h
View File

@ -655,6 +655,7 @@ union Instruction {
} }
constexpr Instruction(u64 value) : value{value} {} constexpr Instruction(u64 value) : value{value} {}
constexpr Instruction(const Instruction& instr) : value(instr.value) {}
BitField<0, 8, Register> gpr0; BitField<0, 8, Register> gpr0;
BitField<8, 8, Register> gpr8; BitField<8, 8, Register> gpr8;

2
src/video_core/renderer_vulkan/fixed_pipeline_state.h
View File

@ -129,7 +129,7 @@ struct alignas(32) FixedPipelineState {
auto& binding = bindings[index]; auto& binding = bindings[index];
binding.raw = 0; binding.raw = 0;
binding.enabled.Assign(enabled ? 1 : 0); binding.enabled.Assign(enabled ? 1 : 0);
binding.stride.Assign(stride); binding.stride.Assign(static_cast<u16>(stride));
binding_divisors[index] = divisor; binding_divisors[index] = divisor;
} }