diff options
| author | 2019-07-16 11:35:33 -0400 | |
|---|---|---|
| committer | 2019-07-18 21:03:29 -0400 | |
| commit | 47df844338a6ad59189cad060cbeced1bc306e73 (patch) | |
| tree | 3c4aaf7aa4a8b48136d245b4f4d5124cb4a90f88 /src | |
| parent | video_core/control_flow: Place all internally linked types/functions within a... (diff) | |
| download | yuzu-47df844338a6ad59189cad060cbeced1bc306e73.tar.gz yuzu-47df844338a6ad59189cad060cbeced1bc306e73.tar.xz yuzu-47df844338a6ad59189cad060cbeced1bc306e73.zip | |
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.
Diffstat (limited to 'src')
| -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) { | |||
| 413 | } | 413 | } |
| 414 | } // Anonymous namespace | 414 | } // Anonymous namespace |
| 415 | 415 | ||
| 416 | std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 program_size, | 416 | std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, |
| 417 | u32 start_address) { | 417 | std::size_t program_size, u32 start_address) { |
| 418 | CFGRebuildState state{program_code, program_size, start_address}; | 418 | CFGRebuildState state{program_code, program_size, start_address}; |
| 419 | // Inspect Code and generate blocks | 419 | // Inspect Code and generate blocks |
| 420 | state.labels.clear(); | 420 | 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 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <cstring> | ||
| 8 | #include <list> | 7 | #include <list> |
| 9 | #include <optional> | 8 | #include <optional> |
| 10 | #include <unordered_set> | 9 | #include <unordered_set> |
| @@ -57,7 +56,7 @@ struct ShaderCharacteristics { | |||
| 57 | std::unordered_set<u32> labels{}; | 56 | std::unordered_set<u32> labels{}; |
| 58 | }; | 57 | }; |
| 59 | 58 | ||
| 60 | std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 program_size, | 59 | std::optional<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, |
| 61 | u32 start_address); | 60 | std::size_t program_size, u32 start_address); |
| 62 | 61 | ||
| 63 | } // namespace VideoCommon::Shader | 62 | } // namespace VideoCommon::Shader |