diff options
| author | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-08-14 06:01:47 +0200 |
|---|---|---|
| committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2021-11-16 22:11:29 +0100 |
| commit | 68e038404cc0069d9f59068a60b56e67b4321e7a (patch) | |
| tree | 81b5bd2f5129d5ea38dd1f739a8a60cbb4c82bc9 /src/video_core | |
| parent | emit_spirv: Fix RescalingLayout alignment (diff) | |
| download | yuzu-68e038404cc0069d9f59068a60b56e67b4321e7a.tar yuzu-68e038404cc0069d9f59068a60b56e67b4321e7a.tar.gz yuzu-68e038404cc0069d9f59068a60b56e67b4321e7a.tar.bz2 yuzu-68e038404cc0069d9f59068a60b56e67b4321e7a.tar.lz yuzu-68e038404cc0069d9f59068a60b56e67b4321e7a.tar.xz yuzu-68e038404cc0069d9f59068a60b56e67b4321e7a.tar.zst yuzu-68e038404cc0069d9f59068a60b56e67b4321e7a.zip | |
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_compute_pipeline.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache_base.h | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp index 9af61c340..5c1f21c65 100644 --- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp +++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp @@ -143,9 +143,6 @@ void ComputePipeline::Configure() { } texture_cache.FillComputeImageViews(std::span(views.data(), views.size())); - const bool is_rescaling{texture_cache.IsRescaling()}; - const f32 config_down_factor{Settings::values.resolution_info.down_factor}; - const f32 down_factor{is_rescaling ? config_down_factor : 1.0f}; if (assembly_program.handle != 0) { program_manager.BindComputeAssemblyProgram(assembly_program.handle); } else { diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 8b417b611..517a4c224 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -41,13 +41,9 @@ using VideoCore::Surface::PixelFormatFromRenderTargetFormat; using namespace Common::Literals; struct ImageViewInOut { - u32 index; - bool blacklist; - union { - struct Empty { - } empty{}; - ImageViewId id; - }; + u32 index{}; + bool blacklist{}; + ImageViewId id{}; }; template <class P> |