summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-12-25 03:11:47 -0300
committerGitHub <noreply@github.com>2020-12-25 03:11:47 -0300
commit0dc4ab42cc1efba566d428c84221a82ef5c76283 (patch)
tree10496fe2792e167f325c926a6204f021452dd228
parent453560fb3a48a4318c10a3e8a631eb923a9a3c32 (diff)
parent1e191cc837cf9ff38e5d5566919be54654d185b9 (diff)
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)
/we4457 # Declaration of 'identifier' hides function parameter
/we4458 # Declaration of 'identifier' hides class member
/we4459 # Declaration of 'identifier' hides global declaration
+ /we4715 # 'function' : not all control paths return a value
)
else()
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:
return OpFOrdGreaterThanEqual(t_bool, operand_1, operand_2);
default:
UNREACHABLE();
+ return v_true;
}
}