New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCSX2-Counters: Fix tracking of scalar limit #2014

Merged
merged 1 commit into from Jul 25, 2017

Conversation

Projects
None yet
4 participants
@ssakash
Member

ssakash commented Jul 17, 2017

Summary of changes

Procedure to reproduce the issue:

  • Toggle to turbo mode
  • Enter emulation settings dialog and change the Turbo Adjust to a different percentage value from the current one.
  • Apply the settings

Master branch behaviour

The framelimit won't be updated, it will only be updated after you toggle back to normal mode and once again come back to turbo mode.

Pull request behaviour

It's updated instantaneously after you press either the OK/Apply button in the emulation settings dialog.

@ssakash ssakash added the Counters label Jul 17, 2017

@ssakash

This comment has been minimized.

Member

ssakash commented Jul 17, 2017

@turtleli

Do you know what's wrong with Appveyor? The same issue also happened in #2005 (comment).

@turtleli

This comment has been minimized.

Member

turtleli commented Jul 17, 2017

No idea. Try rebasing to the latest master?

@ssakash ssakash force-pushed the ssakash:limit_track branch Jul 17, 2017

@ssakash

This comment has been minimized.

Member

ssakash commented Jul 17, 2017

No idea. Try rebasing to the latest master?

Works now but I'm not sure about the issue. I usually have my branch trailing by 4-10 commits from master whenever I make a pull request but I've never noticed this issue before, seems to only occur recently.

@lightningterror

This comment has been minimized.

Member

lightningterror commented Jul 17, 2017

It happened on mine as well.
#1977

pcsx2/gui/GlobalCommands.cpp Outdated
@@ -86,15 +86,15 @@ namespace Implementations
{
g_Conf->EmuOptions.GS.FrameLimitEnable = true;
g_LimiterMode = Limit_Turbo;
g_Conf->EmuOptions.GS.LimitScalar = g_Conf->Framerate.TurboScalar;
gsUpdateFrequency(g_Conf->EmuOptions);

This comment has been minimized.

@gregory38

gregory38 Jul 17, 2017

Contributor

It will conflict with my VSYNC PR. But would it be possible to move this new line outside of all the if/else branches.

This comment has been minimized.

@ssakash

ssakash Jul 18, 2017

Member

But would it be possible to move this new line outside of all the if/else branches.

Nice catch 👍

PCSX2-Counters: Fix tracking of scalar limit
The scalar limit value was updated only during any turbo/slowmotion
toggle, let's also update it properly after any change in the emulation
settings.

This prevents the need of toggling from turbo/slowmotion to update to
your requested frame rate percentage.

@ssakash ssakash force-pushed the ssakash:limit_track branch to 925100e Jul 18, 2017

@gregory38 gregory38 merged commit 59fa831 into PCSX2:master Jul 25, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ssakash ssakash deleted the ssakash:limit_track branch Jul 26, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment