diff options
author | Lioncash <mathew1800@gmail.com> | 2019-07-16 11:35:33 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-07-18 21:03:29 -0400 |
commit | 47df844338a6ad59189cad060cbeced1bc306e73 (patch) | |
tree | 3c4aaf7aa4a8b48136d245b4f4d5124cb4a90f88 | |
parent | 3df9558593d41b8c9bda905dd745a67ff00db033 (diff) |
video_core/control_flow: Make program_size for ScanFlow() a std::size_t
Prevents a truncation warning from occurring with MSVC. Also the
internal data structures already treat it as a size_t, so this is just a
discrepancy in the interface.
-rw-r--r-- | src/video_core/shader/control_flow.cpp | 4 | ||||
-rw-r--r-- | src/video_core/shader/control_flow.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/shader/control_flow.cpp b/src/video_core/shader/control_flow.cpp index 440729258..20f9a6480 100644 --- a/src/video_core/shader/control_flow.cpp +++ b/src/video_core/shader/control_flow.cpp @@ -413,8 +413,8 @@ bool TryQuery(CFGRebuildState& state) { } } // Anonymous namespace -std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 program_size, - u32 start_address) { +std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, + std::size_t program_size, u32 start_address) { CFGRebuildState state{program_code, program_size, start_address}; // Inspect Code and generate blocks state.labels.clear(); diff --git a/src/video_core/shader/control_flow.h b/src/video_core/shader/control_flow.h index 5e8ea3271..728286d70 100644 --- a/src/video_core/shader/control_flow.h +++ b/src/video_core/shader/control_flow.h @@ -4,7 +4,6 @@ #pragma once -#include <cstring> #include <list> #include <optional> #include <unordered_set> @@ -57,7 +56,7 @@ struct ShaderCharacteristics { std::unordered_set<u32> labels{}; }; -std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 program_size, - u32 start_address); +std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, + std::size_t program_size, u32 start_address); } // namespace VideoCommon::Shader |