From 68edde944a5cd3af3b98a97ca327559f78d2891d Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Wed, 26 Nov 2025 10:48:01 -0400 Subject: [PATCH] [revert] Resolving conflicting changes --- .../backend/spirv/emit_spirv_image.cpp | 15 +++------------ src/video_core/renderer_vulkan/vk_texture_cache.h | 3 +++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp index f023ad674e..a59b67cefa 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp @@ -544,19 +544,10 @@ Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id c // This image is multisampled, lod must be implicit lod = Id{}; } - const bool is_integer_fetch = info.type == TextureType::Buffer - ? false - : ctx.textures.at(info.descriptor_index).is_integer; const ImageOperands operands(lod, ms); - const Id image = TextureImage(ctx, info, index); - const Id result_type = is_integer_fetch ? ctx.U32[4] : ctx.F32[4]; - const Id sample = - Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst, result_type, - image, coords, operands.MaskOptional(), operands.Span()); - if (!is_integer_fetch) { - return sample; - } - return ctx.OpBitcast(ctx.F32[4], sample); + return Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst, + ctx.F32[4], TextureImage(ctx, info, index), coords, operands.MaskOptional(), + operands.Span()); } Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id lod, diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index 8788186c43..210520f73a 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later