summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-10-17 20:02:16 +0200
committerGitHub <noreply@github.com>2019-10-17 20:02:16 +0200
commit9fe8072c67f0a99c68b95c69ea19c2334fd0258f (patch)
tree8598c0f3a89dc9962c9682fa9899584ae868a86c /src
parentMerge pull request #2978 from lioncash/doxygen (diff)
parentcontrol_flow: Silence truncation warnings (diff)
downloadyuzu-9fe8072c67f0a99c68b95c69ea19c2334fd0258f.tar
yuzu-9fe8072c67f0a99c68b95c69ea19c2334fd0258f.tar.gz
yuzu-9fe8072c67f0a99c68b95c69ea19c2334fd0258f.tar.bz2
yuzu-9fe8072c67f0a99c68b95c69ea19c2334fd0258f.tar.lz
yuzu-9fe8072c67f0a99c68b95c69ea19c2334fd0258f.tar.xz
yuzu-9fe8072c67f0a99c68b95c69ea19c2334fd0258f.tar.zst
yuzu-9fe8072c67f0a99c68b95c69ea19c2334fd0258f.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp3
-rw-r--r--src/video_core/shader/control_flow.cpp4
-rw-r--r--src/video_core/shader/control_flow.h4
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 7802fd808..c5ec7d9f1 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 268d1aed0..9d21f45de 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 74e54a5c7..37e987d62 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