diff options
| author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2020-04-24 08:54:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 08:54:45 -0400 |
| commit | 6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0 (patch) | |
| tree | 6163449db6bf315f86afff9f1d5f1dac1fad48c6 /src/video_core/renderer_vulkan | |
| parent | 8f548266cd0493a537ed7edf56c869bd7420953a (diff) | |
| parent | e717a1df20b45dc9bd4b77bbbc3d54b1561189d3 (diff) | |
Merge pull request #3786 from degasus/fix_warnings
Fix -Werror=conversion and -Wdeprecated-copy issues
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/fixed_pipeline_state.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |