VERY experimental Nintendo Switch 2 emulator
C++
Vulkan: Add a workaround for input_position on Adreno drivers
Billy Laws77aea7e2b488
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.cppindex db9c94ce8e..1590debc4c 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@@ -321,8 +321,11 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) {case IR::Attribute::PositionY:case IR::Attribute::PositionZ:case IR::Attribute::PositionW:- return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position,- ctx.Const(element)));+ return ctx.OpLoad(ctx.F32[1], ctx.need_input_position_indirect ?+ AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position,+ ctx.u32_zero_value, ctx.Const(element))+ : AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position,+ ctx.Const(element)));case IR::Attribute::InstanceId:if (ctx.profile.support_vertex_instance_id) {return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.instance_id));diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cppindex ecb2db4940..eb1e3e0b6e 100644--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp@@ -721,9 +721,21 @@ void EmitContext::DefineAttributeMemAccess(const Info& info) {size_t label_index{0};if (info.loads.AnyComponent(IR::Attribute::PositionX)) {AddLabel(labels[label_index]);- const Id pointer{is_array- ? OpAccessChain(input_f32, input_position, vertex, masked_index)- : OpAccessChain(input_f32, input_position, masked_index)};+ const Id pointer{[&]() {+ if (need_input_position_indirect) {+ if (is_array)+ return OpAccessChain(input_f32, input_position, vertex, u32_zero_value,+ masked_index);+ else+ return OpAccessChain(input_f32, input_position, u32_zero_value,+ masked_index);+ } else {+ if (is_array)+ return OpAccessChain(input_f32, input_position, vertex, masked_index);+ else+ return OpAccessChain(input_f32, input_position, masked_index);+ }+ }()};const Id result{OpLoad(F32[1], pointer)};OpReturnValue(result);++label_index;@@ -1367,12 +1379,24 @@ void EmitContext::DefineInputs(const IR::Program& program) {Decorate(layer, spv::Decoration::Flat);}if (loads.AnyComponent(IR::Attribute::PositionX)) {- const bool is_fragment{stage != Stage::Fragment};- const spv::BuiltIn built_in{is_fragment ? spv::BuiltIn::Position : spv::BuiltIn::FragCoord};- input_position = DefineInput(*this, F32[4], true, built_in);- if (profile.support_geometry_shader_passthrough) {- if (info.passthrough.AnyComponent(IR::Attribute::PositionX)) {- Decorate(input_position, spv::Decoration::PassthroughNV);+ const bool is_fragment{stage == Stage::Fragment};+ if (!is_fragment && profile.has_broken_spirv_position_input) {+ need_input_position_indirect = true;++ const Id input_position_struct = TypeStruct(F32[4]);+ input_position = DefineInput(*this, input_position_struct, true);++ MemberDecorate(input_position_struct, 0, spv::Decoration::BuiltIn,+ static_cast<unsigned>(spv::BuiltIn::Position));+ Decorate(input_position_struct, spv::Decoration::Block);+ } else {+ const spv::BuiltIn built_in{is_fragment ? spv::BuiltIn::FragCoord : spv::BuiltIn::Position};+ input_position = DefineInput(*this, F32[4], true, built_in);++ if (profile.support_geometry_shader_passthrough) {+ if (info.passthrough.AnyComponent(IR::Attribute::PositionX)) {+ Decorate(input_position, spv::Decoration::PassthroughNV);+ }}}}diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.hindex 4414a51696..dbc5c55b90 100644--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h@@ -280,6 +280,7 @@ public:Id write_global_func_u32x2{};Id write_global_func_u32x4{};+ bool need_input_position_indirect{};Id input_position{};std::array<Id, 32> input_generics{};diff --git a/src/shader_recompiler/profile.h b/src/shader_recompiler/profile.hindex b8841a5367..253e0d0bdd 100644--- a/src/shader_recompiler/profile.h+++ b/src/shader_recompiler/profile.h@@ -55,6 +55,8 @@ struct Profile {/// OpFClamp is broken and OpFMax + OpFMin should be used insteadbool has_broken_spirv_clamp{};+ /// The Position builtin needs to be wrapped in a struct when used as an input+ bool has_broken_spirv_position_input{};/// Offset image operands with an unsigned type do not workbool has_broken_unsigned_image_offsets{};/// Signed instructions with unsigned data types are misinterpreteddiff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 67e5bc648c..4d7770bf86 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -331,6 +331,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device.need_declared_frag_colors = false,.has_broken_spirv_clamp = driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS,+ .has_broken_spirv_position_input = driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY,.has_broken_unsigned_image_offsets = false,.has_broken_signed_operations = false,.has_broken_fp16_float_controls = driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY,