Просмотр исходного кода

shader, video_core: Fix GCC build errors

ameerj 5 лет назад
Родитель
Сommit
68e038404c

+ 0 - 4
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_
         if (base_index != 0) {
             index_value = ctx.OpIAdd(ctx.U32[1], index_value, ctx.Const(base_index));
         }
-        const Id word_index{ctx.OpShiftRightArithmetic(ctx.U32[1], index_value, ctx.Const(5u))};
-        const Id pointer{ctx.OpAccessChain(push_constant_u32, ctx.rescaling_push_constants,
-                                           member_index, word_index)};
-        const Id word{ctx.OpLoad(ctx.U32[1], pointer)};
         const Id bit_index{ctx.OpBitwiseAnd(ctx.U32[1], index_value, ctx.Const(31u))};
         bit = ctx.OpBitFieldUExtract(ctx.U32[1], index_value, bit_index, ctx.Const(1u));
     }

+ 0 - 3
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 {

+ 3 - 7
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>