yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #2980 from lioncash/warn 

maxwell_3d: Silence truncation warnings
This commit is contained in:
bunnei 2019-10-17 14:02:16 -04:00 committed by GitHub
parent 60c602e4e7 77b4916b33
commit 9fe8072c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/video_core/engines/maxwell_3d.cpp
View File

@ -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);

4
src/video_core/shader/control_flow.cpp
View File

@ -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, std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code,
u32 start_address, 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) {

4
src/video_core/shader/control_flow.h
View File

@ -76,8 +76,8 @@ struct ShaderCharacteristics {
CompilerSettings settings{}; CompilerSettings settings{};
}; };
std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code, u32 program_size, std::unique_ptr<ShaderCharacteristics> ScanFlow(const ProgramCode& program_code,
u32 start_address, std::size_t program_size, u32 start_address,
const CompilerSettings& settings); const CompilerSettings& settings);
} // namespace VideoCommon::Shader } // namespace VideoCommon::Shader