JDLOBrew/eden
16
0
Fork 0
Code Pull Requests Actions Packages Releases 4 Activity

[revert] Resolving conflicting changes

Browse Source
This commit is contained in:
CamilleLaVey
2025-11-26 10:48:01 -04:00
parent b50ace27ee
commit 58b2a8a810
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
View File

@@ -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,

3
src/video_core/renderer_vulkan/vk_texture_cache.h
View File

@@ -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