Browse Source
Merge pull request #2980 from lioncash/warn
maxwell_3d: Silence truncation warnings
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
5 deletions
-
src/video_core/engines/maxwell_3d.cpp
-
src/video_core/shader/control_flow.cpp
-
src/video_core/shader/control_flow.h
|
|
@ -101,7 +101,8 @@ void Maxwell3D::InitializeRegisterDefaults() { |
|
|
#define DIRTY_REGS_POS(field_name) (offsetof(Maxwell3D::DirtyRegs, field_name))
|
|
|
#define DIRTY_REGS_POS(field_name) (offsetof(Maxwell3D::DirtyRegs, field_name))
|
|
|
|
|
|
|
|
|
void Maxwell3D::InitDirtySettings() { |
|
|
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 start_itr = dirty_pointers.begin() + start; |
|
|
const auto end_itr = start_itr + range; |
|
|
const auto end_itr = start_itr + range; |
|
|
std::fill(start_itr, end_itr, position); |
|
|
std::fill(start_itr, end_itr, position); |
|
|
|
|
|
@ -473,8 +473,8 @@ void DecompileShader(CFGRebuildState& state) { |
|
|
state.manager->Decompile(); |
|
|
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) { |
|
|
const CompilerSettings& settings) { |
|
|
auto result_out = std::make_unique<ShaderCharacteristics>(); |
|
|
auto result_out = std::make_unique<ShaderCharacteristics>(); |
|
|
if (settings.depth == CompileDepth::BruteForce) { |
|
|
if (settings.depth == CompileDepth::BruteForce) { |
|
|
|
|
|
@ -76,8 +76,8 @@ struct ShaderCharacteristics { |
|
|
CompilerSettings settings{}; |
|
|
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); |
|
|
const CompilerSettings& settings); |
|
|
|
|
|
|
|
|
} // namespace VideoCommon::Shader |
|
|
} // namespace VideoCommon::Shader |