diff options
| author | Markus Wick <markus@selfnet.de> | 2020-04-24 09:27:51 +0200 |
|---|---|---|
| committer | Markus Wick <markus@selfnet.de> | 2020-04-24 09:33:04 +0200 |
| commit | c499c22cf749e49d223b653b036e560a618bb6e2 (patch) | |
| tree | 1d6e722109d5d9e7e83339ff14533af8ec46296a | |
| parent | Merge pull request #3760 from Morph1984/trailing-filedir-separator (diff) | |
| download | yuzu-c499c22cf749e49d223b653b036e560a618bb6e2.tar yuzu-c499c22cf749e49d223b653b036e560a618bb6e2.tar.gz yuzu-c499c22cf749e49d223b653b036e560a618bb6e2.tar.bz2 yuzu-c499c22cf749e49d223b653b036e560a618bb6e2.tar.lz yuzu-c499c22cf749e49d223b653b036e560a618bb6e2.tar.xz yuzu-c499c22cf749e49d223b653b036e560a618bb6e2.tar.zst yuzu-c499c22cf749e49d223b653b036e560a618bb6e2.zip | |
| -rw-r--r-- | src/common/bit_field.h | 2 | ||||
| -rw-r--r-- | 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<StorageType>(storage) & ~mask) | FormatValue(value); + storage = static_cast<StorageType>((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<u16>(stride)); binding_divisors[index] = divisor; } |