diff options
| author | bunnei <bunneidev@gmail.com> | 2019-10-17 14:02:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-17 14:02:16 -0400 |
| commit | 9fe8072c67f0a99c68b95c69ea19c2334fd0258f (patch) | |
| tree | 8598c0f3a89dc9962c9682fa9899584ae868a86c | |
| parent | 60c602e4e77abdefedf0fb1c70606723d17988c9 (diff) | |
| parent | 77b4916b3311f97a39e3111976dcffc33ff96a1c (diff) | |
Merge pull request #2980 from lioncash/warn
maxwell_3d: Silence truncation warnings
| -rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/shader/control_flow.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/shader/control_flow.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 7802fd8082..c5ec7d9f1b 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp @@ -101,7 +101,8 @@ void Maxwell3D::InitializeRegisterDefaults() { #define DIRTY_REGS_POS(field_name) (offsetof(Maxwell3D::DirtyRegs, field_name)) void Maxwell3D::InitDirtySettings() { - const auto set_block = [this](const u32 start, const u32 range, const u8 position) { + const auto set_block = [this](const std::size_t start, const std::size_t range, + const u8 position) { const auto start_itr = dirty_pointers.begin() + start; const auto end_itr = start_itr + range; std::fill(start_itr, end_itr, position); diff --git a/src/video_core/shader/control_flow.cpp b/src/video_core/shader/control_flow.cpp index 268d1aed00..9d21f45ded 100644 --- a/src/video_core/shader/control_flow.cpp +++ b/src/video_core/shader/control_flow.cpp @@ -473,8 +473,8 @@ void DecompileShader(CFGRebuildState& state) { state.manager->Decompile(); } -std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 program_size, - u32 start_address, +std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, + std::size_t program_size, u32 start_address, const CompilerSettings& settings) { auto result_out = std::make_unique<ShaderCharacteristics>(); if (settings.depth == CompileDepth::BruteForce) { diff --git a/src/video_core/shader/control_flow.h b/src/video_core/shader/control_flow.h index 74e54a5c77..37e987d629 100644 --- a/src/video_core/shader/control_flow.h +++ b/src/video_core/shader/control_flow.h @@ -76,8 +76,8 @@ struct ShaderCharacteristics { CompilerSettings settings{}; }; -std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 program_size, - u32 start_address, +std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, + std::size_t program_size, u32 start_address, const CompilerSettings& settings); } // namespace VideoCommon::Shader |