summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_vulkan
diff options
context:
space:
mode:
authorGravatar Zach Hilman2020-04-24 08:54:45 -0400
committerGravatar GitHub2020-04-24 08:54:45 -0400
commit6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0 (patch)
tree6163449db6bf315f86afff9f1d5f1dac1fad48c6 /src/video_core/renderer_vulkan
parentMerge pull request #3760 from Morph1984/trailing-filedir-separator (diff)
parentFix -Wdeprecated-copy warning. (diff)
downloadyuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.gz
yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.tar.xz
yuzu-6ec965ef91260d6eb3ec32d9bd0a4a00654e29c0.zip
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.h2
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 {
129 auto& binding = bindings[index]; 129 auto& binding = bindings[index];
130 binding.raw = 0; 130 binding.raw = 0;
131 binding.enabled.Assign(enabled ? 1 : 0); 131 binding.enabled.Assign(enabled ? 1 : 0);
132 binding.stride.Assign(stride); 132 binding.stride.Assign(static_cast<u16>(stride));
133 binding_divisors[index] = divisor; 133 binding_divisors[index] = divisor;
134 } 134 }
135 135