mirror of
https://github.com/citra-emu/citra.git
synced 2024-12-22 12:10:04 +00:00
gcc 11 compatibility fix
This commit is contained in:
parent
86b775bd8f
commit
bf5711d944
src
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <limits>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
@ -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);
|
||||||
|
switch(screen_id)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
if (info.active_fb == 0) {
|
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_left1)),
|
framebuffer_config[0].address_left1)),
|
||||||
phys_address_left);
|
phys_address_left);
|
||||||
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_right1)),
|
||||||
phys_address_right);
|
phys_address_right);
|
||||||
} else {
|
} 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_left2)),
|
framebuffer_config[0].address_left2)),
|
||||||
phys_address_left);
|
phys_address_left);
|
||||||
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_right2)),
|
||||||
phys_address_right);
|
phys_address_right);
|
||||||
}
|
}
|
||||||
WriteSingleHWReg(base_address +
|
WriteSingleHWReg(base_address +
|
||||||
4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].stride)),
|
4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[0].stride)),
|
||||||
info.stride);
|
info.stride);
|
||||||
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
|
WriteSingleHWReg(base_address + 4 * static_cast<u32>(GPU_REG_INDEX(
|
||||||
framebuffer_config[screen_id].color_format)),
|
framebuffer_config[0].color_format)),
|
||||||
info.format);
|
info.format);
|
||||||
WriteSingleHWReg(
|
WriteSingleHWReg(
|
||||||
base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[screen_id].active_fb)),
|
base_address + 4 * static_cast<u32>(GPU_REG_INDEX(framebuffer_config[0].active_fb)),
|
||||||
info.shown_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;
|
||||||
|
}
|
||||||
|
|
||||||
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);
|
||||||
|
Loading…
Reference in New Issue
Block a user