[emit_spirv_image] remove the fix for LA/EOW

src/android/app/src/main/res/values/strings.xml

@@ -596,7 +596,7 @@
     <string name="nce_invalidation_gpu_readback">GPU Readback Before NCE Invalidation</string>
     <string name="nce_invalidation_gpu_readback_description">Temporary. Fix Ender Magnolia (and other UE titles) crashes. May reduce performance. Improvement in progress.</string>
     <string name="fix_bloom_effects">Fix Bloom Effects</string>
-    <string name="fix_bloom_effects_description">Reduces bloom blur in LA/EOW (Adreno A6XX - A7XX/ Turnip), removes bloom in Burnout. Warning: may cause graphical artifacts in other games.</string>
+    <string name="fix_bloom_effects_description">Removes bloom in Burnout.</string>
     <string name="emulate_bgr565">Emulate BGR565</string>
     <string name="emulate_bgr565_description">Fixes problems with inverted colors in games or strange artifacts or strange shadows.</string>
     <string name="rescale_hack">Enable Legacy Rescale Pass</string>

src/shader_recompiler/backend/spirv/emit_spirv_image.cpp

@@ -586,16 +586,9 @@ Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value&
     const bool is_integer{IsTextureInteger(ctx, info)};
     const Id result_type{is_integer ? ctx.U32[4] : ctx.F32[4]};
     const ImageOperands operands(ctx, false, true, false, lod, offset);
-
-    Id result = Emit(&EmitContext::OpImageSparseSampleExplicitLod,
-                     &EmitContext::OpImageSampleExplicitLod, ctx, inst, result_type,
-                     Texture(ctx, info, index), coords, operands.Mask(), operands.Span());
-#ifdef __ANDROID__
-    if (!is_integer && Settings::values.fix_bloom_effects.GetValue()) {
-        result = ctx.OpVectorTimesScalar(ctx.F32[4], result, ctx.Const(0.98f));
-    }
-#endif
-    return is_integer ? ctx.OpBitcast(ctx.F32[4], result) : result;
+    return Emit(&EmitContext::OpImageSparseSampleExplicitLod,
+                &EmitContext::OpImageSampleExplicitLod, ctx, inst, ctx.F32[4],
+                Texture(ctx, info, index), coords, operands.Mask(), operands.Span());
 }
 
 Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,

src/video_core/buffer_cache/buffer_cache.h

@@ -1738,64 +1738,36 @@ void BufferCache<P>::TouchBuffer(Buffer& buffer, BufferId buffer_id) noexcept {
 
 template <class P>
 bool BufferCache<P>::SynchronizeBuffer(Buffer& buffer, DAddr device_addr, u32 size) {
-#ifdef __ANDROID__
-    const bool use_optimized_vertex_buffers = Settings::values.use_optimized_vertex_buffers.GetValue();
-#else
-    constexpr bool use_optimized_vertex_buffers = true;
-#endif
-
-    if (use_optimized_vertex_buffers) {
-        upload_copies.clear();
-        u64 total_size_bytes = 0;
-        u64 largest_copy = 0;
-        const DAddr buffer_start = buffer.cpu_addr_cached;
-        const auto add_upload = [&](DAddr start, DAddr end) {
-            if (start == end) return;
-            const u64 range_size = end - start;
-            upload_copies.push_back(BufferCopy{
-                .src_offset = total_size_bytes,
-                .dst_offset = start - buffer_start,
-                .size = range_size,
-            });
-            total_size_bytes += range_size;
-            largest_copy = (std::max)(largest_copy, range_size);
-        };
-        memory_tracker.ForEachUploadRange(device_addr, size, [&](u64 device_addr_out, u64 range_size) {
-            DAddr upload_start = device_addr_out;
-            gpu_modified_ranges.ForEachInRange(device_addr_out, range_size, [&](DAddr gpu_start, DAddr gpu_end) {
-                add_upload(upload_start, gpu_start);
-                upload_start = gpu_end;
-            });
-            add_upload(upload_start, device_addr_out + range_size);
+    upload_copies.clear();
+    u64 total_size_bytes = 0;
+    u64 largest_copy = 0;
+    const DAddr buffer_start = buffer.cpu_addr_cached;
+    const auto add_upload = [&](DAddr start, DAddr end) {
+        if (start == end) return;
+        const u64 range_size = end - start;
+        upload_copies.push_back(BufferCopy{
+            .src_offset = total_size_bytes,
+            .dst_offset = start - buffer_start,
+            .size = range_size,
         });
-        if (total_size_bytes == 0) {
-            return true;
-        }
-        const std::span<BufferCopy> copies_span(upload_copies.data(), upload_copies.size());
-        UploadMemory(buffer, total_size_bytes, largest_copy, copies_span);
-        any_buffer_uploaded = true;
-        return false;
-    } else {
-        boost::container::small_vector<BufferCopy, 4> copies;
-        u64 total_size_bytes = 0;
-        u64 largest_copy = 0;
-        DAddr buffer_start = buffer.CpuAddr();
-        memory_tracker.ForEachUploadRange(device_addr, size, [&](u64 device_addr_out, u64 range_size) {
-            copies.push_back(BufferCopy{
-                .src_offset = total_size_bytes,
-                .dst_offset = device_addr_out - buffer_start,
-                .size = range_size,
-            });
-            total_size_bytes += range_size;
-            largest_copy = (std::max)(largest_copy, range_size);
+        total_size_bytes += range_size;
+        largest_copy = (std::max)(largest_copy, range_size);
+    };
+    memory_tracker.ForEachUploadRange(device_addr, size, [&](u64 device_addr_out, u64 range_size) {
+        DAddr upload_start = device_addr_out;
+        gpu_modified_ranges.ForEachInRange(device_addr_out, range_size, [&](DAddr gpu_start, DAddr gpu_end) {
+            add_upload(upload_start, gpu_start);
+            upload_start = gpu_end;
         });
-        if (total_size_bytes == 0) {
-            return true;
-        }
-        const std::span<BufferCopy> copies_span(copies.data(), copies.size());
-        UploadMemory(buffer, total_size_bytes, largest_copy, copies_span);
-        return false;
+        add_upload(upload_start, device_addr_out + range_size);
+    });
+    if (total_size_bytes == 0) {
+        return true;
     }
+    const std::span<BufferCopy> copies_span(upload_copies.data(), upload_copies.size());
+    UploadMemory(buffer, total_size_bytes, largest_copy, copies_span);
+    any_buffer_uploaded = true;
+    return false;
 }
 
 template <class P>