octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -Werror=conversion error.

Browse Source
This commit is contained in:
Markus Wick
2020-04-24 09:27:51 +02:00
parent 8f548266cd
commit c499c22cf7
2 changed files with 2 additions and 2 deletions
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 {

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;
} }