summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Rodrigo Locatti2020-12-25 03:11:47 -0300
committerGravatar GitHub2020-12-25 03:11:47 -0300
commit0dc4ab42cc1efba566d428c84221a82ef5c76283 (patch)
tree10496fe2792e167f325c926a6204f021452dd228
parentMerge pull request #5225 from ReinUsesLisp/always-vulkan (diff)
parentvideo_core: Enforce C4715 (not all control paths return a value) (diff)
downloadyuzu-0dc4ab42cc1efba566d428c84221a82ef5c76283.tar.gz
yuzu-0dc4ab42cc1efba566d428c84221a82ef5c76283.tar.xz
yuzu-0dc4ab42cc1efba566d428c84221a82ef5c76283.zip
Merge pull request #5226 from ReinUsesLisp/c4715-vc
video_core: Enforce C4715 (not all control paths return a value)
-rw-r--r--src/video_core/CMakeLists.txt1
-rw-r--r--src/video_core/renderer_vulkan/vk_shader_decompiler.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 26db24d0f..5b73724ce 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -294,6 +294,7 @@ if (MSVC)
294 /we4457 # Declaration of 'identifier' hides function parameter 294 /we4457 # Declaration of 'identifier' hides function parameter
295 /we4458 # Declaration of 'identifier' hides class member 295 /we4458 # Declaration of 'identifier' hides class member
296 /we4459 # Declaration of 'identifier' hides global declaration 296 /we4459 # Declaration of 'identifier' hides global declaration
297 /we4715 # 'function' : not all control paths return a value
297 ) 298 )
298else() 299else()
299 target_compile_options(video_core PRIVATE 300 target_compile_options(video_core PRIVATE
diff --git a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
index ca12b3793..72954d0e3 100644
--- a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
+++ b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp
@@ -2094,6 +2094,7 @@ private:
2094 return OpFOrdGreaterThanEqual(t_bool, operand_1, operand_2); 2094 return OpFOrdGreaterThanEqual(t_bool, operand_1, operand_2);
2095 default: 2095 default:
2096 UNREACHABLE(); 2096 UNREACHABLE();
2097 return v_true;
2097 } 2098 }
2098 } 2099 }
2099 2100