Retropex/dolphin
1
0
Fork 0
mirror of https://github.com/Retropex/dolphin.git synced 2025-05-13 03:40:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Double frequency of VI callback & Patch engine callback

Browse Source
This commit is contained in:
shiiion 2022-01-31 00:51:07 -08:00
parent 959606e4a7
commit b0fdc6ca24
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.10)
# MacOS prior to 10.14 did not support aligned alloc which is used to implement # MacOS prior to 10.14 did not support aligned alloc which is used to implement
# std::unique_ptr in the arm64 C++ standard library. x86_64 builds can override # std::unique_ptr in the arm64 C++ standard library. x86_64 builds can override
# this to 10.13.0 using -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13.0" without issue. # this to 10.13.0 using -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13.0" without issue.
# This is done in the universal binary building script to build a binary that # This is done in the universal binary building script to build a binary that
# runs on 10.13 on x86_64 computers, while still containing an arm64 slice. # runs on 10.13 on x86_64 computers, while still containing an arm64 slice.
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "")
@ -73,7 +73,7 @@ endif()
if(APPLE) if(APPLE)
option(MACOS_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF) option(MACOS_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF) option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF)
# Enable adhoc code signing by default (otherwise makefile builds on ARM will not work) # Enable adhoc code signing by default (otherwise makefile builds on ARM will not work)
option(MACOS_CODE_SIGNING "Enable codesigning" ON) option(MACOS_CODE_SIGNING "Enable codesigning" ON)
set(MACOS_CODE_SIGNING_IDENTITY "-" CACHE STRING "The identity used for codesigning.") set(MACOS_CODE_SIGNING_IDENTITY "-" CACHE STRING "The identity used for codesigning.")
@ -485,7 +485,7 @@ if(ENCODE_FRAMEDUMPS)
endif() endif()
find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale) find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale)
if(FFmpeg_FOUND) if(FFmpeg_FOUND)
if(APPLE) if(APPLE)
find_library(COREMEDIA_LIBRARY CoreMedia) find_library(COREMEDIA_LIBRARY CoreMedia)
find_library(VIDEOTOOLBOX_LIBRARY VideoToolbox) find_library(VIDEOTOOLBOX_LIBRARY VideoToolbox)
find_library(COREVIDEO_LIBRARY CoreVideo) find_library(COREVIDEO_LIBRARY CoreVideo)
@ -560,14 +560,9 @@ if (_M_X86)
endif() endif()
add_subdirectory(Externals/cpp-optparse) add_subdirectory(Externals/cpp-optparse)
find_package(fmt 7.1) check_vendoring_approved(fmt)
if(fmt_FOUND) message(STATUS "Using static fmt from Externals")
message(STATUS "Using shared fmt ${fmt_VERSION}") add_subdirectory(Externals/fmt EXCLUDE_FROM_ALL)
else()
check_vendoring_approved(fmt)
message(STATUS "Using static fmt from Externals")
add_subdirectory(Externals/fmt EXCLUDE_FROM_ALL)
endif()
add_subdirectory(Externals/imgui) add_subdirectory(Externals/imgui)
add_subdirectory(Externals/glslang) add_subdirectory(Externals/glslang)

4
Source/Core/Core/HW/SystemTimers.cpp
View File

@ -130,7 +130,7 @@ void IPC_HLE_UpdateCallback(u64 userdata, s64 cyclesLate)
void VICallback(u64 userdata, s64 cyclesLate) void VICallback(u64 userdata, s64 cyclesLate)
{ {
VideoInterface::Update(CoreTiming::GetTicks() - cyclesLate); VideoInterface::Update(CoreTiming::GetTicks() - cyclesLate);
CoreTiming::ScheduleEvent(VideoInterface::GetTicksPerHalfLine() - cyclesLate, et_VI); CoreTiming::ScheduleEvent((VideoInterface::GetTicksPerHalfLine() / 2) - cyclesLate, et_VI);
} }
void DecrementerCallback(u64 userdata, s64 cyclesLate) void DecrementerCallback(u64 userdata, s64 cyclesLate)
@ -143,7 +143,7 @@ void PatchEngineCallback(u64 userdata, s64 cycles_late)
{ {
// We have 2 periods, a 1000 cycle error period and the VI period. // We have 2 periods, a 1000 cycle error period and the VI period.
// We have to carefully combine these together so that we stay on the VI period without drifting. // We have to carefully combine these together so that we stay on the VI period without drifting.
u32 vi_interval = VideoInterface::GetTicksPerField(); u32 vi_interval = VideoInterface::GetTicksPerField() / 2;
s64 cycles_pruned = (userdata + cycles_late) % vi_interval; s64 cycles_pruned = (userdata + cycles_late) % vi_interval;
s64 next_schedule = 0; s64 next_schedule = 0;