N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gcc 11 compatibility fix

Browse source
This commit is contained in:
thesource 2021-04-29 12:02:19 +03:00
parent 86b775bd8f
commit bf5711d944
2 changed files with 55 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/ring_buffer.h
View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <limits>
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <atomic> #include <atomic>

77
src/core/hle/service/gsp/gsp_gpu.cpp
View file

@ -282,30 +282,61 @@ ResultCode SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) {
u32 base_address = 0x400000; u32 base_address = 0x400000;
PAddr phys_address_left = VirtualToPhysicalAddress(info.address_left); PAddr phys_address_left = VirtualToPhysicalAddress(info.address_left);
PAddr phys_address_right = VirtualToPhysicalAddress(info.address_right); PAddr phys_address_right = VirtualToPhysicalAddress(info.address_right);
if (info.active_fb == 0) { switch(screen_id)
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX( {
framebuffer_config[screen_id].address_left1)), case 0:
phys_address_left); if (info.active_fb == 0) {
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX( WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[screen_id].address_right1)), framebuffer_config[0].address_left1)),
phys_address_right); phys_address_left);
} else { WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX( framebuffer_config[0].address_right1)),
framebuffer_config[screen_id].address_left2)), phys_address_right);
phys_address_left); } else {
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX( WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[screen_id].address_right2)), framebuffer_config[0].address_left2)),
phys_address_right); phys_address_left);
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[0].address_right2)),
phys_address_right);
}
WriteSingleHWReg(base_address +
4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[0].stride)),
info.stride);
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[0].color_format)),
info.format);
WriteSingleHWReg(
base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[0].active_fb)),
info.shown_fb);
break;
case 1:
if (info.active_fb == 0) {
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[1].address_left1)),
phys_address_left);
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[1].address_right1)),
phys_address_right);
} else {
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[1].address_left2)),
phys_address_left);
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[1].address_right2)),
phys_address_right);
}
WriteSingleHWReg(base_address +
4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[1].stride)),
info.stride);
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[1].color_format)),
info.format);
WriteSingleHWReg(
base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[1].active_fb)),
info.shown_fb);
break;
} }
WriteSingleHWReg(base_address +
4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].stride)),
info.stride);
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
framebuffer_config[screen_id].color_format)),
info.format);
WriteSingleHWReg(
base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].active_fb)),
info.shown_fb);
if (Pica::g_debug_context) if (Pica::g_debug_context)
Pica::g_debug_context->OnEvent(Pica::DebugContext::Event::BufferSwapped, nullptr); Pica::g_debug_context->OnEvent(Pica::DebugContext::Event::BufferSwapped, nullptr);