Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-27 15:07:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix

Browse source
This commit is contained in:
lizzie 2026-05-26 23:24:57 +00:00
parent cbfdb6eb7c
commit 7c0bde6db0
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
View file

@ -195,9 +195,9 @@ Id Texture(EmitContext& ctx, IR::TextureInstInfo info, [[maybe_unused]] const IR
const TextureDefinition& def{ctx.textures.at(info.descriptor_index)}; const TextureDefinition& def{ctx.textures.at(info.descriptor_index)};
if (def.count > 1) { if (def.count > 1) {
auto const idx = index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index); auto const idx = index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index);
if (!ctx.non_uniform_ids.contains(idx) && IsNonUniformDescriptor(ctx, index)) { if (!ctx.non_uniform_ids.contains(idx.value) && IsNonUniformDescriptor(ctx, index)) {
ctx.Decorate(idx, spv::Decoration::NonUniform); ctx.Decorate(idx, spv::Decoration::NonUniform);
ctx.non_uniform_ids.insert(idx); ctx.non_uniform_ids.insert(idx.value);
} }
const Id pointer{ctx.OpAccessChain(def.pointer_type, def.id, idx)}; const Id pointer{ctx.OpAccessChain(def.pointer_type, def.id, idx)};
const Id object{ctx.OpLoad(def.sampled_type, pointer)}; const Id object{ctx.OpLoad(def.sampled_type, pointer)};
@ -220,9 +220,9 @@ Id TextureImage(EmitContext& ctx, IR::TextureInstInfo info, const IR::Value& ind
const TextureDefinition& def{ctx.textures.at(info.descriptor_index)}; const TextureDefinition& def{ctx.textures.at(info.descriptor_index)};
if (def.count > 1) { if (def.count > 1) {
auto const idx = index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index); auto const idx = index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index);
if (!ctx.non_uniform_ids.contains(idx) && IsNonUniformDescriptor(ctx, index)) { if (!ctx.non_uniform_ids.contains(idx.value) && IsNonUniformDescriptor(ctx, index)) {
ctx.Decorate(idx, spv::Decoration::NonUniform); ctx.Decorate(idx, spv::Decoration::NonUniform);
ctx.non_uniform_ids.insert(idx); ctx.non_uniform_ids.insert(idx.value);
} }
const Id ptr = ctx.OpAccessChain(def.pointer_type, def.id, idx); const Id ptr = ctx.OpAccessChain(def.pointer_type, def.id, idx);
const Id object = ctx.OpLoad(def.sampled_type, ptr); const Id object = ctx.OpLoad(def.sampled_type, ptr);

3
src/shader_recompiler/backend/spirv/spirv_emit_context.h
View file

@ -367,7 +367,8 @@ public:
Id load_const_func_u32x2{}; Id load_const_func_u32x2{};
Id load_const_func_u32x4{}; Id load_const_func_u32x4{};
ankerl::unordered_dense::set<Id> non_uniform_ids; // Sirit::Id doesn't play nice with *::set<>
ankerl::unordered_dense::set<u32> non_uniform_ids;
private: private:
void DefineCommonTypes(const Info& info); void DefineCommonTypes(const Info& info);