ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8884 from iwubcode/freelook_performance_fix 

VertexShaderManager: Only look for freelook config changes if we're using freelook
This commit is contained in:
Connor McLaughlin 2020-07-04 14:19:59 +10:00 committed by GitHub
parent 38b36536b2 0441d6aa5e
commit 9c12a843f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -63,6 +63,7 @@
#include "VideoCommon/FrameDump.h" #include "VideoCommon/FrameDump.h"
#include "VideoCommon/FramebufferManager.h" #include "VideoCommon/FramebufferManager.h"
#include "VideoCommon/FramebufferShaderGen.h" #include "VideoCommon/FramebufferShaderGen.h"
#include "VideoCommon/FreeLookCamera.h"
#include "VideoCommon/ImageWrite.h" #include "VideoCommon/ImageWrite.h"
#include "VideoCommon/NetPlayChatUI.h" #include "VideoCommon/NetPlayChatUI.h"
#include "VideoCommon/NetPlayGolfUI.h" #include "VideoCommon/NetPlayGolfUI.h"
@ -406,6 +407,11 @@ void Renderer::CheckForConfigChanges()
UpdateActiveConfig(); UpdateActiveConfig();
if (g_ActiveConfig.bFreeLook)
{
g_freelook_camera.SetControlType(g_ActiveConfig.iFreelookControlType);
}
// Update texture cache settings with any changed options. // Update texture cache settings with any changed options.
g_texture_cache->OnConfigChanged(g_ActiveConfig); g_texture_cache->OnConfigChanged(g_ActiveConfig);

3
Source/Core/VideoCommon/VertexShaderManager.cpp
View File

@ -455,9 +455,6 @@ void VertexShaderManager::SetConstants()
dirty = true; dirty = true;
} }
// Handle a potential config change
g_freelook_camera.SetControlType(Config::Get(Config::GFX_FREE_LOOK_CONTROL_TYPE));
} }
void VertexShaderManager::InvalidateXFRange(int start, int end) void VertexShaderManager::InvalidateXFRange(int start, int end)

1
Source/Core/VideoCommon/VideoConfig.cpp
View File

@ -91,6 +91,7 @@ void VideoConfig::Refresh()
bDumpXFBTarget = Config::Get(Config::GFX_DUMP_XFB_TARGET); bDumpXFBTarget = Config::Get(Config::GFX_DUMP_XFB_TARGET);
bDumpFramesAsImages = Config::Get(Config::GFX_DUMP_FRAMES_AS_IMAGES); bDumpFramesAsImages = Config::Get(Config::GFX_DUMP_FRAMES_AS_IMAGES);
bFreeLook = Config::Get(Config::GFX_FREE_LOOK); bFreeLook = Config::Get(Config::GFX_FREE_LOOK);
iFreelookControlType = Config::Get(Config::GFX_FREE_LOOK_CONTROL_TYPE);
bUseFFV1 = Config::Get(Config::GFX_USE_FFV1); bUseFFV1 = Config::Get(Config::GFX_USE_FFV1);
sDumpFormat = Config::Get(Config::GFX_DUMP_FORMAT); sDumpFormat = Config::Get(Config::GFX_DUMP_FORMAT);
sDumpCodec = Config::Get(Config::GFX_DUMP_CODEC); sDumpCodec = Config::Get(Config::GFX_DUMP_CODEC);