diff options
author | Liam <byteslice@airmail.cc> | 2023-12-19 04:20:25 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-12-19 04:25:14 +0100 |
commit | fcfa8b680b6aedd4b51757d4e33e97ef2cdae048 (patch) | |
tree | de1aac013700c0e22d378b8a35f5f20b6e35d161 /src | |
parent | shader_recompiler: ignore clip distances beyond driver support level (diff) | |
download | yuzu-fcfa8b680b6aedd4b51757d4e33e97ef2cdae048.tar yuzu-fcfa8b680b6aedd4b51757d4e33e97ef2cdae048.tar.gz yuzu-fcfa8b680b6aedd4b51757d4e33e97ef2cdae048.tar.bz2 yuzu-fcfa8b680b6aedd4b51757d4e33e97ef2cdae048.tar.lz yuzu-fcfa8b680b6aedd4b51757d4e33e97ef2cdae048.tar.xz yuzu-fcfa8b680b6aedd4b51757d4e33e97ef2cdae048.tar.zst yuzu-fcfa8b680b6aedd4b51757d4e33e97ef2cdae048.zip |
Diffstat (limited to '')
-rw-r--r-- | src/shader_recompiler/backend/spirv/spirv_emit_context.cpp | 3 | ||||
-rw-r--r-- | src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp | 6 | ||||
-rw-r--r-- | src/shader_recompiler/shader_info.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index 4d24e02de..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(std::min(8U, profile.max_user_clip_distances)))}; + 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] && diff --git a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp index 70292686f..cb82a326c 100644 --- a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp +++ b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp @@ -913,7 +913,11 @@ void GatherInfoFromHeader(Environment& env, Info& info) { } for (size_t index = 0; index < 8; ++index) { const u16 mask{header.vtg.omap_systemc.clip_distances}; - info.stores.Set(IR::Attribute::ClipDistance0 + index, ((mask >> index) & 1) != 0); + const bool used{((mask >> index) & 1) != 0}; + info.stores.Set(IR::Attribute::ClipDistance0 + index, used); + if (used) { + info.used_clip_distances = static_cast<u32>(index) + 1; + } } info.stores.Set(IR::Attribute::PrimitiveId, header.vtg.omap_systemb.primitive_array_id != 0); diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h index b4b4afd37..1419b8fe7 100644 --- a/src/shader_recompiler/shader_info.h +++ b/src/shader_recompiler/shader_info.h @@ -227,6 +227,8 @@ struct Info { bool requires_layer_emulation{}; IR::Attribute emulated_layer{}; + u32 used_clip_distances{}; + boost::container::static_vector<ConstantBufferDescriptor, MAX_CBUFS> constant_buffer_descriptors; boost::container::static_vector<StorageBufferDescriptor, MAX_SSBOS> storage_buffers_descriptors; |