Browse Source
Merge pull request #3786 from degasus/fix_warnings
Fix -Werror=conversion and -Wdeprecated-copy issues
pull/15/merge
Zach Hilman
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
2 deletions
-
src/common/bit_field.h
-
src/video_core/engines/shader_bytecode.h
-
src/video_core/renderer_vulkan/fixed_pipeline_state.h
|
|
|
@ -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; |
|
|
|
} |
|
|
|
|
|
|
|
|