mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 19:47:18 +02:00
parent
d3b7f57b2b
commit
0820c99462
@ -59,7 +59,6 @@ void Config::ReadValues() {
|
|||||||
|
|
||||||
// Core
|
// Core
|
||||||
Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);
|
Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);
|
||||||
Settings::values.frame_skip = sdl2_config->GetInteger("Core", "frame_skip", 0);
|
|
||||||
|
|
||||||
// Renderer
|
// Renderer
|
||||||
Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true);
|
Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true);
|
||||||
|
@ -42,10 +42,6 @@ pad_circle_modifier_scale =
|
|||||||
# 0: Interpreter (slow), 1 (default): JIT (fast)
|
# 0: Interpreter (slow), 1 (default): JIT (fast)
|
||||||
use_cpu_jit =
|
use_cpu_jit =
|
||||||
|
|
||||||
# The applied frameskip amount. Must be a power of two.
|
|
||||||
# 0 (default): No frameskip, 1: x2 frameskip, 2: x4 frameskip, 3: x8 frameskip, etc.
|
|
||||||
frame_skip =
|
|
||||||
|
|
||||||
[Renderer]
|
[Renderer]
|
||||||
# Whether to use software or hardware rendering.
|
# Whether to use software or hardware rendering.
|
||||||
# 0: Software, 1 (default): Hardware
|
# 0: Software, 1 (default): Hardware
|
||||||
|
@ -39,7 +39,6 @@ void Config::ReadValues() {
|
|||||||
|
|
||||||
qt_config->beginGroup("Core");
|
qt_config->beginGroup("Core");
|
||||||
Settings::values.use_cpu_jit = qt_config->value("use_cpu_jit", true).toBool();
|
Settings::values.use_cpu_jit = qt_config->value("use_cpu_jit", true).toBool();
|
||||||
Settings::values.frame_skip = qt_config->value("frame_skip", 0).toInt();
|
|
||||||
qt_config->endGroup();
|
qt_config->endGroup();
|
||||||
|
|
||||||
qt_config->beginGroup("Renderer");
|
qt_config->beginGroup("Renderer");
|
||||||
@ -146,7 +145,6 @@ void Config::SaveValues() {
|
|||||||
|
|
||||||
qt_config->beginGroup("Core");
|
qt_config->beginGroup("Core");
|
||||||
qt_config->setValue("use_cpu_jit", Settings::values.use_cpu_jit);
|
qt_config->setValue("use_cpu_jit", Settings::values.use_cpu_jit);
|
||||||
qt_config->setValue("frame_skip", Settings::values.frame_skip);
|
|
||||||
qt_config->endGroup();
|
qt_config->endGroup();
|
||||||
|
|
||||||
qt_config->beginGroup("Renderer");
|
qt_config->beginGroup("Renderer");
|
||||||
|
@ -29,16 +29,12 @@ namespace GPU {
|
|||||||
|
|
||||||
Regs g_regs;
|
Regs g_regs;
|
||||||
|
|
||||||
/// True if the current frame was skipped
|
|
||||||
bool g_skip_frame;
|
|
||||||
/// 268MHz CPU clocks / 60Hz frames per second
|
/// 268MHz CPU clocks / 60Hz frames per second
|
||||||
const u64 frame_ticks = 268123480ull / 60;
|
const u64 frame_ticks = 268123480ull / 60;
|
||||||
/// Event id for CoreTiming
|
/// Event id for CoreTiming
|
||||||
static int vblank_event;
|
static int vblank_event;
|
||||||
/// Total number of frames drawn
|
/// Total number of frames drawn
|
||||||
static u64 frame_count;
|
static u64 frame_count;
|
||||||
/// True if the last frame was skipped
|
|
||||||
static bool last_skip_frame;
|
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
inline void Read(T& var, const u32 raw_addr) {
|
inline void Read(T& var, const u32 raw_addr) {
|
||||||
@ -519,20 +515,7 @@ template void Write<u8>(u32 addr, const u8 data);
|
|||||||
/// Update hardware
|
/// Update hardware
|
||||||
static void VBlankCallback(u64 userdata, int cycles_late) {
|
static void VBlankCallback(u64 userdata, int cycles_late) {
|
||||||
frame_count++;
|
frame_count++;
|
||||||
last_skip_frame = g_skip_frame;
|
VideoCore::g_renderer->SwapBuffers();
|
||||||
g_skip_frame = (frame_count & Settings::values.frame_skip) != 0;
|
|
||||||
|
|
||||||
// Swap buffers based on the frameskip mode, which is a little bit tricky. When
|
|
||||||
// a frame is being skipped, nothing is being rendered to the internal framebuffer(s).
|
|
||||||
// So, we should only swap frames if the last frame was rendered. The rules are:
|
|
||||||
// - If frameskip == 0 (disabled), always swap buffers
|
|
||||||
// - If frameskip == 1, swap buffers every other frame (starting from the first frame)
|
|
||||||
// - If frameskip > 1, swap buffers every frameskip^n frames (starting from the second frame)
|
|
||||||
if ((((Settings::values.frame_skip != 1) ^ last_skip_frame) &&
|
|
||||||
last_skip_frame != g_skip_frame) ||
|
|
||||||
Settings::values.frame_skip == 0) {
|
|
||||||
VideoCore::g_renderer->SwapBuffers();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signal to GSP that GPU interrupt has occurred
|
// Signal to GSP that GPU interrupt has occurred
|
||||||
// TODO(yuriks): hwtest to determine if PDC0 is for the Top screen and PDC1 for the Sub
|
// TODO(yuriks): hwtest to determine if PDC0 is for the Top screen and PDC1 for the Sub
|
||||||
@ -579,8 +562,6 @@ void Init() {
|
|||||||
framebuffer_sub.color_format.Assign(Regs::PixelFormat::RGB8);
|
framebuffer_sub.color_format.Assign(Regs::PixelFormat::RGB8);
|
||||||
framebuffer_sub.active_fb = 0;
|
framebuffer_sub.active_fb = 0;
|
||||||
|
|
||||||
last_skip_frame = false;
|
|
||||||
g_skip_frame = false;
|
|
||||||
frame_count = 0;
|
frame_count = 0;
|
||||||
|
|
||||||
vblank_event = CoreTiming::RegisterEvent("GPU::VBlankCallback", VBlankCallback);
|
vblank_event = CoreTiming::RegisterEvent("GPU::VBlankCallback", VBlankCallback);
|
||||||
|
@ -316,7 +316,6 @@ ASSERT_REG_POSITION(command_processor_config, 0x00638);
|
|||||||
static_assert(sizeof(Regs) == 0x1000 * sizeof(u32), "Invalid total size of register set");
|
static_assert(sizeof(Regs) == 0x1000 * sizeof(u32), "Invalid total size of register set");
|
||||||
|
|
||||||
extern Regs g_regs;
|
extern Regs g_regs;
|
||||||
extern bool g_skip_frame;
|
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void Read(T& var, const u32 addr);
|
void Read(T& var, const u32 addr);
|
||||||
|
@ -78,7 +78,6 @@ struct Values {
|
|||||||
|
|
||||||
// Core
|
// Core
|
||||||
bool use_cpu_jit;
|
bool use_cpu_jit;
|
||||||
int frame_skip;
|
|
||||||
|
|
||||||
// Data Storage
|
// Data Storage
|
||||||
bool use_virtual_sd;
|
bool use_virtual_sd;
|
||||||
|
@ -52,10 +52,6 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
|
|||||||
if (id >= regs.NumIds())
|
if (id >= regs.NumIds())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// If we're skipping this frame, only allow trigger IRQ
|
|
||||||
if (GPU::g_skip_frame && id != PICA_REG_INDEX(trigger_irq))
|
|
||||||
return;
|
|
||||||
|
|
||||||
// TODO: Figure out how register masking acts on e.g. vs.uniform_setup.set_value
|
// TODO: Figure out how register masking acts on e.g. vs.uniform_setup.set_value
|
||||||
u32 old_value = regs[id];
|
u32 old_value = regs[id];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user