diff options
| author | 2021-09-18 00:43:41 -0400 | |
|---|---|---|
| committer | 2021-11-16 22:11:30 +0100 | |
| commit | b027fac7945184d644aa00940e528a20edcf0d06 (patch) | |
| tree | 302d34b7e09cf8ca5c2cd6760e24a5494fbf9fb9 /src/video_core | |
| parent | vk_texture_cache: Minor cleanup (diff) | |
| download | yuzu-b027fac7945184d644aa00940e528a20edcf0d06.tar.gz yuzu-b027fac7945184d644aa00940e528a20edcf0d06.tar.xz yuzu-b027fac7945184d644aa00940e528a20edcf0d06.zip | |
gl_texture_cache/rescaling_pass: minor cleanup
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 22fffb19b..64bd88c3b 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp | |||
| @@ -474,8 +474,7 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, ProgramManager& | |||
| 474 | set_view(Shader::TextureType::ColorArrayCube, null_image_cube_array.handle); | 474 | set_view(Shader::TextureType::ColorArrayCube, null_image_cube_array.handle); |
| 475 | 475 | ||
| 476 | resolution = Settings::values.resolution_info; | 476 | resolution = Settings::values.resolution_info; |
| 477 | is_rescaling_on = resolution.up_scale != 1 || resolution.down_shift != 0; | 477 | if (resolution.active) { |
| 478 | if (is_rescaling_on) { | ||
| 479 | rescale_draw_fbo.Create(); | 478 | rescale_draw_fbo.Create(); |
| 480 | rescale_read_fbo.Create(); | 479 | rescale_read_fbo.Create(); |
| 481 | 480 | ||
| @@ -957,7 +956,7 @@ bool Image::ScaleUp() { | |||
| 957 | if (True(flags & ImageFlagBits::Rescaled)) { | 956 | if (True(flags & ImageFlagBits::Rescaled)) { |
| 958 | return false; | 957 | return false; |
| 959 | } | 958 | } |
| 960 | if (!runtime->is_rescaling_on) { | 959 | if (!runtime->resolution.active) { |
| 961 | return false; | 960 | return false; |
| 962 | } | 961 | } |
| 963 | if (gl_format == 0 && gl_type == 0) { | 962 | if (gl_format == 0 && gl_type == 0) { |
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index f4dcc6f9b..6c8033003 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h | |||
| @@ -156,7 +156,6 @@ private: | |||
| 156 | OGLFramebuffer rescale_draw_fbo; | 156 | OGLFramebuffer rescale_draw_fbo; |
| 157 | OGLFramebuffer rescale_read_fbo; | 157 | OGLFramebuffer rescale_read_fbo; |
| 158 | Settings::ResolutionScalingInfo resolution; | 158 | Settings::ResolutionScalingInfo resolution; |
| 159 | bool is_rescaling_on{}; | ||
| 160 | }; | 159 | }; |
| 161 | 160 | ||
| 162 | class Image : public VideoCommon::ImageBase { | 161 | class Image : public VideoCommon::ImageBase { |