Implement Native Resolution Rescaling #2860

FernandoS27 · 2019-09-15T11:21:54Z

Native Resolution Rescaling in Emulators used to be an almost trivial process for old console GPUs where only 1 render target existed, memory wasn't unified (in the GPU sense, not on SoC sense) and textures weren't anywhere as complex as they are now. Native Resolution Rescaling for a modern GPU as Maxwell 2nd Gen is quite a challenge due to many factors: More complex texture types can be partially or entirely rendered onto: Cube textures, Array Textures, 3d Textures, etc; 8 different render targets with shared viewports and scissor tests, unified memories with uncalled readbacks and hardcoded shaders created for fixed resolutions (glFragCoord & TexelFetch). This PR introduces a set of heuristics and mechanisms to detect possible candidate render targets for rescaling based on a simple evolutive AI algorithm and performs render target rescaling based on a generated database of rescalable rendertargets (rescale profile) plus its corrections on state and shader code.

ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -772,6 +768,11 @@ void RasterizerOpenGL::DrawArrays() {
        gpu.dirty.ResetVertexArrays();
    }

+    bool res_scaling = texture_cache.IsResolutionScalingEnabled();


ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/renderer_opengl/gl_rasterizer.cpp

    const auto& regs = system.GPU().Maxwell3D().regs;
    const bool geometry_shaders_enabled =
        regs.IsShaderConfigEnabled(static_cast<size_t>(Maxwell::ShaderProgram::Geometry));
    const std::size_t viewport_count =
        geometry_shaders_enabled ? Tegra::Engines::Maxwell3D::Regs::NumViewports : 1;
+    float factor = rescaling ? Settings::values.resolution_factor : 1.0;


const and 1.0f
resolution_factor should be changed to be an integer, since we don't plan to support downscaling.

ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/renderer_opengl/gl_rasterizer.cpp

    const auto& regs = system.GPU().Maxwell3D().regs;
    const bool geometry_shaders_enabled =
        regs.IsShaderConfigEnabled(static_cast<size_t>(Maxwell::ShaderProgram::Geometry));
    const std::size_t viewport_count =
        geometry_shaders_enabled ? Tegra::Engines::Maxwell3D::Regs::NumViewports : 1;
+    float factor = rescaling ? Settings::values.resolution_factor : 1.0;


ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/renderer_opengl/gl_rasterizer.cpp

-        dst.y = src.min_y;
-        dst.width = width;
-        dst.height = height;
+        dst.x = src.min_x * factor;


If resolution_factor type is not changed, this will signal warnings about implicitly converting float to T, enclose with a static_cast<u32>(...)

ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/renderer_opengl/gl_rasterizer.h

@@ -156,7 +156,7 @@ class RasterizerOpenGL : public VideoCore::RasterizerInterface {
                    const GLShader::ImageEntry& entry);

    /// Syncs the viewport and depth range to match the guest state
-    void SyncViewport(OpenGLState& current_state);
+    void SyncViewport(OpenGLState& current_state, bool rescaling = false);


Don't use an optional parameter here, it is be dangerous not to keep in mind that rescaling is enabled.

ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/texture_cache/resolution_scaling/database.h

+    std::unordered_set<ResolutionKey> database;
+    std::unordered_set<ResolutionKey> blacklist;
+    bool initialized{};
+    u64 title_id;


Zero initialize this with {}.

ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/texture_cache/texture_cache.h

        for (std::size_t i = 0; i < Tegra::Engines::Maxwell3D::Regs::NumRenderTargets; i++) {
            SetEmptyColorBuffer(i);
        }

+        enable_resolution_scaling =
+            Settings::values.resolution_factor != 1.0 && !Settings::values.use_resolution_scanner;


Change 1.0 to 1 if resolution_factor type is changed, otherwise use 1.0f instead.

ReinUsesLisp · 2019-09-18T06:18:44Z

src/video_core/texture_cache/texture_cache.h

+    // Must be called by child's create surface
+    void SignalCreatedSurface(TSurface& new_surface) {
+        if (EnabledRescaling()) {
+            if (IsInRSDatabase(new_surface)) {


Use && with the previous ìf

ReinUsesLisp · 2019-09-18T06:18:44Z

src/yuzu/configuration/config.cpp

@@ -567,6 +567,10 @@ void Config::ReadRendererValues() {
        ReadSetting(QStringLiteral("use_accurate_gpu_emulation"), false).toBool();
    Settings::values.use_asynchronous_gpu_emulation =
        ReadSetting(QStringLiteral("use_asynchronous_gpu_emulation"), false).toBool();
+    Settings::values.use_resolution_scanner =
+        ReadSetting(QStringLiteral("use_resolution_scanner"), false).toBool();
+    Settings::values.use_resolution_scanner =


Rebase typo? This is being set twice.

ReinUsesLisp · 2019-09-18T06:18:44Z

src/yuzu/main.cpp

+    // OS we just open the transferable shader cache folder without preselecting the transferable
+    // shader cache file for the selected game.
+#if defined(Q_OS_WIN)
+    const QString explorer = QStringLiteral("explorer");


We should have a function for doing this. This code is copied and pasted from somewhere else.

ReinUsesLisp · 2019-09-18T06:21:23Z

I dislike using uniform constants, but it's the sanest solution we have.

ReinUsesLisp · 2019-09-19T00:53:30Z

src/video_core/texture_cache/resolution_scaling/database.h

-    std::unordered_set<ResolutionKey> database;
-    std::unordered_set<ResolutionKey> blacklist;
+    std::unordered_set<ResolutionKey> database{};
+    std::unordered_set<ResolutionKey> blacklist{};


These {} are not needed. std::unordered_set has a constructor.

src/video_core/texture_cache/resolution_scaling/database.h

lioncash · 2019-09-19T22:15:00Z

src/video_core/renderer_opengl/gl_shader_manager.cpp

-using Tegra::Engines::Maxwell3D;
+using Maxwell = Tegra::Engines::Maxwell3D::Regs;
+
+enum ProgramLocations : u32 {


This can be relocated into UpdateConstants to keep their scope to their only usage area.

lioncash · 2019-09-19T22:15:00Z

src/video_core/renderer_opengl/gl_shader_manager.cpp

+    const GLfloat rescale_factor = rescaling ? Settings::values.resolution_factor : 1.0f;
+
+    for (const auto stage :
+         std::array{current_state.vertex, current_state.geometry, current_state.fragment}) {


You should be able to do this with a normal initializer list like:

Suggested change

std::array{current_state.vertex, current_state.geometry, current_state.fragment}) {

for (const auto stage : {current_state.vertex, current_state.geometry, current_state.fragment}) {

lioncash · 2019-09-19T22:15:00Z

src/video_core/renderer_opengl/gl_shader_manager.h

+            struct {
+                GLuint instance_id;
+                GLuint flip_stage;
+                GLfloat y_direction;


It's undefined behavior to access this and the rescaling factor if any of the other fields are accessed, since they don't have a common type.

lioncash · 2019-09-19T22:15:00Z

src/video_core/texture_cache/resolution_scaling/database.cpp

+    return FileUtil::GetUserPath(FileUtil::UserPath::RescalingDir);
+}
+
+ScalingDatabase::ScalingDatabase(Core::System& system) : database{}, blacklist{}, system{system} {


Suggested change

ScalingDatabase::ScalingDatabase(Core::System& system) : database{}, blacklist{}, system{system} {

ScalingDatabase::ScalingDatabase(Core::System& system) : system{system} {

These types already have a constructor

lioncash · 2019-09-19T22:15:00Z

src/video_core/texture_cache/resolution_scaling/database.cpp

+}
+
+ScalingDatabase::ScalingDatabase(Core::System& system) : database{}, blacklist{}, system{system} {
+    title_id = 0;


This is already initialized within the class declaration itself, so it can be removed.

lioncash · 2019-09-19T22:15:00Z

src/video_core/texture_cache/resolution_scaling/database.h

+    void Init();
+
+    bool IsInDatabase(const PixelFormat format, const u32 width, const u32 height) {
+        ResolutionKey key{format, width, height};


This can be a const member function.

lioncash · 2019-09-19T22:15:00Z

src/video_core/texture_cache/resolution_scaling/database.h

+        return database.count(key) > 0;
+    }
+
+    bool IsBlacklisted(const PixelFormat format, const u32 width, const u32 height) {


lioncash · 2019-09-19T22:15:00Z

src/video_core/texture_cache/texture_cache.h

+        return enable_resolution_scaling;
+    }
+
+    bool IsResScannerEnabled() const {


Suggested change

bool IsResScannerEnabled() const {

bool IsResolutionScannerEnabled() const {

Res is easily confused with other names (e.g. Resource), It's also inconsistent with naming elsewhere in the codebase (IsResolutionScalingEnabled, etc)

lioncash · 2019-09-19T22:15:00Z

src/video_core/texture_cache/texture_cache.h

+        scaling_database.Register(params.pixel_format, params.width, params.height);
+    }
+
+    bool IsRSBlacklisted(const TSurface& surface) {


This can be a const member function

lioncash · 2019-09-19T22:15:00Z

src/video_core/texture_cache/texture_cache.h

+        return scaling_database.IsBlacklisted(params.pixel_format, params.width, params.height);
+    }
+
+    bool IsInRSDatabase(const TSurface& surface) {


ogniK5377 · 2019-09-21T10:02:48Z

Reminder to address issues @FernandoS27

FernandoS27 · 2019-09-22T12:20:07Z

@ogniK5377 Done, a few things weren't possible due to the lack of flexibility in json API.

CLAassistant · 2019-09-30T23:20:28Z

All committers have signed the CLA.

…s scaling on imasge blit, image copy and buffer copy

…rescaled

…ith Auto.

…ther feedback.

Explicit locations break Intel and AMD's proprietary drivers. Use glGetUniformLocation and implicit locations instead.

losh11 · 2020-09-26T01:03:14Z

Wondering why this was never merged?

renA21 · 2020-10-06T16:36:41Z

Wondering why this was never merged?

Read the PSA here: https://yuzu-emu.org/help/feature/resolution-rescaler/

GDhex12 added the gpu-new label Sep 15, 2019

FernandoS27 force-pushed the FernandoS27:resolution-rescaling-4 branch from 2752580 to 77742bf Sep 16, 2019

ReinUsesLisp reviewed Sep 18, 2019

View changes

ReinUsesLisp added the opengl label Sep 18, 2019

ReinUsesLisp reviewed Sep 19, 2019

View changes

lioncash reviewed Sep 19, 2019

View changes

FernandoS27 force-pushed the FernandoS27:resolution-rescaling-4 branch from 8afd738 to 552f4a8 Sep 22, 2019

ogniK5377 added the canary-merge label Sep 22, 2019

FernandoS27 removed the canary-merge label Sep 22, 2019

FernandoS27 force-pushed the FernandoS27:resolution-rescaling-4 branch from 552f4a8 to f510aba Sep 22, 2019

FernandoS27 added the canary-merge label Sep 22, 2019

DarkLordZach added the mainline-merge label Sep 22, 2019

ogniK5377 removed canary-merge mainline-merge labels Sep 25, 2019

yuzu-emu deleted a comment from CLAassistant Sep 30, 2019

FernandoS27 force-pushed the FernandoS27:resolution-rescaling-4 branch 2 times, most recently from 95116e5 to e6ab6eb Oct 4, 2019

FernandoS27 added canary-merge and removed canary-merge labels Oct 4, 2019

FernandoS27 force-pushed the FernandoS27:resolution-rescaling-4 branch from e6ab6eb to 8cf23ad Oct 5, 2019

FernandoS27 added canary-merge and removed canary-merge labels Oct 5, 2019

ReinUsesLisp and others added 4 commits Jul 7, 2019

gl_shader_manager: Drop emulation UBO, use uniform constants

b9f21e4

Texture_Cache: Initial Implementation of Resolution Scaling

e1a86c2

Texture_Cache: Update resolution scaler profile

1cfd3ff

Texture_Cache: Implement Resolution Scanner

ba95bc0

FernandoS27 and others added 20 commits Jul 6, 2019

Texture_Cache: Add resolution scanning to UI

df6c7ab

Texture_Cache: Corrections to resolution scanning

0a93394

Texture_Cache: Corrections and fixes to resolution rescaler

28e9c79

Texture_Cache: Try to scale Rebuilds and Blits

3ddbdd0

Texture_Cache: Refactor Resolution database and simplify some processes

6b609a7

Texture_Cache: Correct Blacklisting on the same draw and implement re…

36af7c6

…s scaling on imasge blit, image copy and buffer copy

Texture_Cache: Implement rescaled surface loading.

f3777b5

Add UI and accessors for Rescaling profiles

a9f741a

gl_shader_decompiler: Correct gl_FragCoord.x/y when render target is …

e2c76c4

…rescaled

Texture_Cache: Simplifications to RS Database handling.

4596d5b

Texture_Cache: Correct compile warnings

fdfa328

Texture_Cache correct some bugs introduced on rescaling

a7bceb8

Configure_Graphics: Add Docked Resolutions and Correct Possible bug w…

8db18e8

…ith Auto.

GL_Shader_Decompiler: Correct rebase errors.

2696541

Yuzu UI: Correct rescaling profile selector.

7969dc7

Yuzu UI: Redo Resolution Rescaler UI to be easier to manage.

ee94e83

General: Correct clang-format

298de8e

ResolutionRescaling: Address feedback and refactor

b2676f7

ResolutioRescaling: Correct reading profiles in windows and address o…

f1fe521

…ther feedback.

gl_shader_manager: Avoid using uniform constants with explicit locations

Loading status checks…

4096dc7

Explicit locations break Intel and AMD's proprietary drivers. Use glGetUniformLocation and implicit locations instead.

FernandoS27 force-pushed the FernandoS27:resolution-rescaling-4 branch from 8cf23ad to 4096dc7 Oct 5, 2019

FernandoS27 added mainline-merge and removed mainline-merge labels Oct 7, 2019

yuzu-emu / yuzu

Implement Native Resolution Rescaling #2860

Implement Native Resolution Rescaling #2860

FernandoS27 commented Sep 15, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ReinUsesLisp commented Sep 18, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ogniK5377 commented Sep 21, 2019

FernandoS27 commented Sep 22, 2019

CLAassistant commented Sep 30, 2019 •

edited

losh11 commented Sep 26, 2020

renA21 commented Oct 6, 2020

	std::array{current_state.vertex, current_state.geometry, current_state.fragment}) {
	for (const auto stage : {current_state.vertex, current_state.geometry, current_state.fragment}) {

	ScalingDatabase::ScalingDatabase(Core::System& system) : database{}, blacklist{}, system{system} {
	ScalingDatabase::ScalingDatabase(Core::System& system) : system{system} {

	bool IsResScannerEnabled() const {
	bool IsResolutionScannerEnabled() const {

yuzu-emu / yuzu

Sponsor yuzu-emu/yuzu

Implement Native Resolution Rescaling #2860

Implement Native Resolution Rescaling #2860

Conversation

FernandoS27 commented Sep 15, 2019

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

This comment has been minimized.

ReinUsesLisp Sep 18, 2019 Contributor

ReinUsesLisp commented Sep 18, 2019

This comment has been minimized.

ReinUsesLisp Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

This comment has been minimized.

lioncash Sep 19, 2019 Contributor

ogniK5377 commented Sep 21, 2019

FernandoS27 commented Sep 22, 2019

CLAassistant commented Sep 30, 2019 • edited

losh11 commented Sep 26, 2020

renA21 commented Oct 6, 2020

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 18, 2019
Contributor

ReinUsesLisp Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

lioncash Sep 19, 2019
Contributor

CLAassistant commented Sep 30, 2019 •

edited