Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4628 from FearlessTobi/backport-some-stuff

Browse source 
Backport various minor frontend review changes from yuzu and port minor PR from yuzu
This commit is contained in:
Weiyi Wang 2019-02-14 11:45:27 -05:00 • committed by GitHub
commit de1128c60d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/renderer_base.h
View file

@ -46,7 +46,11 @@ public:
return rasterizer.get();
}
EmuWindow& GetRenderWindow() const {
EmuWindow& GetRenderWindow() {
return render_window;
}
const EmuWindow& GetRenderWindow() const {
return render_window;
}

6
src/video_core/video_core.cpp
View file

@ -71,9 +71,9 @@ void RequestScreenshot(void* data, std::function<void()> callback,
u16 GetResolutionScaleFactor() {
if (g_hw_renderer_enabled) {
return !Settings::values.resolution_factor
? g_renderer->GetRenderWindow().GetFramebufferLayout().GetScalingRatio()
: Settings::values.resolution_factor;
return Settings::values.resolution_factor
? Settings::values.resolution_factor
: g_renderer->GetRenderWindow().GetFramebufferLayout().GetScalingRatio();
} else {
// Software renderer always render at native resolution
return 1;