diff options
| author | Fernando S <fsahmkow27@gmail.com> | 2023-12-20 18:45:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 18:45:20 +0100 |
| commit | 9e5b4052edddba9655be7293fe147619ccc86436 (patch) | |
| tree | 26454a8e0b4e00e6c5a087ca23dac2674f486e49 /src/shader_recompiler/backend/spirv | |
| parent | Merge pull request #12390 from liamwhite/binding-insanity (diff) | |
| parent | shader_recompiler: use minimal clip distance array (diff) | |
| download | yuzu-9e5b4052edddba9655be7293fe147619ccc86436.tar yuzu-9e5b4052edddba9655be7293fe147619ccc86436.tar.gz yuzu-9e5b4052edddba9655be7293fe147619ccc86436.tar.bz2 yuzu-9e5b4052edddba9655be7293fe147619ccc86436.tar.lz yuzu-9e5b4052edddba9655be7293fe147619ccc86436.tar.xz yuzu-9e5b4052edddba9655be7293fe147619ccc86436.tar.zst yuzu-9e5b4052edddba9655be7293fe147619ccc86436.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp | 5 | ||||
| -rw-r--r-- | src/shader_recompiler/backend/spirv/spirv_emit_context.cpp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp index e5a78a914..feca5105f 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp @@ -74,6 +74,11 @@ std::optional<OutAttr> OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) { case IR::Attribute::ClipDistance7: { const u32 base{static_cast<u32>(IR::Attribute::ClipDistance0)}; const u32 index{static_cast<u32>(attr) - base}; + if (index >= ctx.profile.max_user_clip_distances) { + LOG_WARNING(Shader, "Ignoring clip distance store {} >= {} supported", index, + ctx.profile.max_user_clip_distances); + return std::nullopt; + } const Id clip_num{ctx.Const(index)}; return OutputAccessChain(ctx, ctx.output_f32, ctx.clip_distances, clip_num); } diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index 3350f1f85..2abc21a17 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp @@ -1528,7 +1528,8 @@ void EmitContext::DefineOutputs(const IR::Program& program) { if (stage == Stage::Fragment) { throw NotImplementedException("Storing ClipDistance in fragment stage"); } - const Id type{TypeArray(F32[1], Const(8U))}; + const Id type{TypeArray( + F32[1], Const(std::min(info.used_clip_distances, profile.max_user_clip_distances)))}; clip_distances = DefineOutput(*this, type, invocations, spv::BuiltIn::ClipDistance); } if (info.stores[IR::Attribute::Layer] && |