From c499c22cf749e49d223b653b036e560a618bb6e2 Mon Sep 17 00:00:00 2001 From: Markus Wick Date: Fri, 24 Apr 2020 09:27:51 +0200 Subject: [PATCH 1/2] Fix -Werror=conversion error. --- src/common/bit_field.h | 2 +- src/video_core/renderer_vulkan/fixed_pipeline_state.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/bit_field.h b/src/common/bit_field.h index fd2bbbd99..26ae6c7fc 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -180,7 +180,7 @@ public: } constexpr void Assign(const T& value) { - storage = (static_cast(storage) & ~mask) | FormatValue(value); + storage = static_cast((storage & ~mask) | FormatValue(value)); } constexpr T Value() const { diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.h b/src/video_core/renderer_vulkan/fixed_pipeline_state.h index 9fe6bdbf9..9a950f4de 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.h +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.h @@ -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(stride)); binding_divisors[index] = divisor; } From e717a1df20b45dc9bd4b77bbbc3d54b1561189d3 Mon Sep 17 00:00:00 2001 From: Markus Wick Date: Fri, 24 Apr 2020 09:29:07 +0200 Subject: [PATCH 2/2] Fix -Wdeprecated-copy warning. --- src/video_core/engines/shader_bytecode.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 7231597d4..73d98fe8c 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -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;