summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Mat M2020-04-22 21:20:14 -0400
committerGravatar GitHub2020-04-22 21:20:14 -0400
commit2c806c5fd33054d5e8d667d251899696472a2381 (patch)
treecbae28c1b2262fdf8fe4bd30977995281d493148 /src
parentMerge pull request #3725 from MerryMage/fpcr (diff)
parentvk_pipeline_cache: Fix unintentional memcpy into optional (diff)
downloadyuzu-2c806c5fd33054d5e8d667d251899696472a2381.tar.gz
yuzu-2c806c5fd33054d5e8d667d251899696472a2381.tar.xz
yuzu-2c806c5fd33054d5e8d667d251899696472a2381.zip
Merge pull request #3767 from ReinUsesLisp/point-size-pipeline
vk_pipeline_cache: Fix unintentional memcpy into optional
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_vulkan/vk_pipeline_cache.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 8fdc6400d..a792130fd 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -330,8 +330,10 @@ VKPipelineCache::DecompileShaders(const GraphicsPipelineCacheKey& key) {
330 330
331 Specialization specialization; 331 Specialization specialization;
332 if (fixed_state.rasterizer.Topology() == Maxwell::PrimitiveTopology::Points) { 332 if (fixed_state.rasterizer.Topology() == Maxwell::PrimitiveTopology::Points) {
333 ASSERT(fixed_state.rasterizer.point_size != 0); 333 float point_size;
334 std::memcpy(&specialization.point_size, &fixed_state.rasterizer.point_size, sizeof(u32)); 334 std::memcpy(&point_size, &fixed_state.rasterizer.point_size, sizeof(float));
335 specialization.point_size = point_size;
336 ASSERT(point_size != 0.0f);
335 } 337 }
336 for (std::size_t i = 0; i < Maxwell::NumVertexAttributes; ++i) { 338 for (std::size_t i = 0; i < Maxwell::NumVertexAttributes; ++i) {
337 specialization.attribute_types[i] = fixed_state.vertex_input.attributes[i].Type(); 339 specialization.attribute_types[i] = fixed_state.vertex_input.attributes[i].Type();