summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/shader_recompiler/backend/spirv/emit_spirv_image.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_compute_pipeline.cpp3
-rw-r--r--src/video_core/texture_cache/texture_cache_base.h10
3 files changed, 3 insertions, 14 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
index 519ce8b9b..4d168a96d 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
@@ -243,10 +243,6 @@ Id IsScaled(EmitContext& ctx, const IR::Value& index, Id member_index, u32 base_
243 if (base_index != 0) { 243 if (base_index != 0) {
244 index_value = ctx.OpIAdd(ctx.U32[1], index_value, ctx.Const(base_index)); 244 index_value = ctx.OpIAdd(ctx.U32[1], index_value, ctx.Const(base_index));
245 } 245 }
246 const Id word_index{ctx.OpShiftRightArithmetic(ctx.U32[1], index_value, ctx.Const(5u))};
247 const Id pointer{ctx.OpAccessChain(push_constant_u32, ctx.rescaling_push_constants,
248 member_index, word_index)};
249 const Id word{ctx.OpLoad(ctx.U32[1], pointer)};
250 const Id bit_index{ctx.OpBitwiseAnd(ctx.U32[1], index_value, ctx.Const(31u))}; 246 const Id bit_index{ctx.OpBitwiseAnd(ctx.U32[1], index_value, ctx.Const(31u))};
251 bit = ctx.OpBitFieldUExtract(ctx.U32[1], index_value, bit_index, ctx.Const(1u)); 247 bit = ctx.OpBitFieldUExtract(ctx.U32[1], index_value, bit_index, ctx.Const(1u));
252 } 248 }
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() {
143 } 143 }
144 texture_cache.FillComputeImageViews(std::span(views.data(), views.size())); 144 texture_cache.FillComputeImageViews(std::span(views.data(), views.size()));
145 145
146 const bool is_rescaling{texture_cache.IsRescaling()};
147 const f32 config_down_factor{Settings::values.resolution_info.down_factor};
148 const f32 down_factor{is_rescaling ? config_down_factor : 1.0f};
149 if (assembly_program.handle != 0) { 146 if (assembly_program.handle != 0) {
150 program_manager.BindComputeAssemblyProgram(assembly_program.handle); 147 program_manager.BindComputeAssemblyProgram(assembly_program.handle);
151 } else { 148 } 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;
41using namespace Common::Literals; 41using namespace Common::Literals;
42 42
43struct ImageViewInOut { 43struct ImageViewInOut {
44 u32 index; 44 u32 index{};
45 bool blacklist; 45 bool blacklist{};
46 union { 46 ImageViewId id{};
47 struct Empty {
48 } empty{};
49 ImageViewId id;
50 };
51}; 47};
52 48
53template <class P> 49template <class P>