VERY experimental Nintendo Switch 2 emulator
C++
video_core: Fix legacy to generic location unpaired
FengChen1dd5d8fc8e76
diff --git a/src/shader_recompiler/frontend/maxwell/translate_program.cpp b/src/shader_recompiler/frontend/maxwell/translate_program.cppindex 77efb4f577..3aee33a961 100644--- a/src/shader_recompiler/frontend/maxwell/translate_program.cpp+++ b/src/shader_recompiler/frontend/maxwell/translate_program.cpp@@ -137,28 +137,35 @@ bool IsLegacyAttribute(IR::Attribute attribute) {}std::map<IR::Attribute, IR::Attribute> GenerateLegacyToGenericMappings(- const VaryingState& state, std::queue<IR::Attribute> ununsed_generics) {+ const VaryingState& state, std::queue<IR::Attribute> unused_generics,+ const std::map<IR::Attribute, IR::Attribute>& previous_stage_mapping) {std::map<IR::Attribute, IR::Attribute> mapping;+ auto update_mapping = [&mapping, &unused_generics, previous_stage_mapping](IR::Attribute attr,+ size_t count) {+ if (previous_stage_mapping.find(attr) != previous_stage_mapping.end()) {+ for (size_t i = 0; i < count; ++i) {+ mapping.insert({attr + i, previous_stage_mapping.at(attr + i)});+ }+ } else {+ for (size_t i = 0; i < count; ++i) {+ mapping.insert({attr + i, unused_generics.front() + i});+ }+ unused_generics.pop();+ }+ };for (size_t index = 0; index < 4; ++index) {auto attr = IR::Attribute::ColorFrontDiffuseR + index * 4;if (state.AnyComponent(attr)) {- for (size_t i = 0; i < 4; ++i) {- mapping.insert({attr + i, ununsed_generics.front() + i});- }- ununsed_generics.pop();+ update_mapping(attr, 4);}}if (state[IR::Attribute::FogCoordinate]) {- mapping.insert({IR::Attribute::FogCoordinate, ununsed_generics.front()});- ununsed_generics.pop();+ update_mapping(IR::Attribute::FogCoordinate, 1);}for (size_t index = 0; index < IR::NUM_FIXEDFNCTEXTURE; ++index) {auto attr = IR::Attribute::FixedFncTexture0S + index * 4;if (state.AnyComponent(attr)) {- for (size_t i = 0; i < 4; ++i) {- mapping.insert({attr + i, ununsed_generics.front() + i});- }- ununsed_generics.pop();+ update_mapping(attr, 4);}}return mapping;@@ -271,15 +278,16 @@ void ConvertLegacyToGeneric(IR::Program& program, const Shader::RuntimeInfo& runununsed_output_generics.push(IR::Attribute::Generic0X + index * 4);}}- auto mappings = GenerateLegacyToGenericMappings(stores, ununsed_output_generics);+ program.info.legacy_stores_mapping =+ GenerateLegacyToGenericMappings(stores, ununsed_output_generics, {});for (IR::Block* const block : program.post_order_blocks) {for (IR::Inst& inst : block->Instructions()) {switch (inst.GetOpcode()) {case IR::Opcode::SetAttribute: {const auto attr = inst.Arg(0).Attribute();if (IsLegacyAttribute(attr)) {- stores.Set(mappings[attr], true);- inst.SetArg(0, Shader::IR::Value(mappings[attr]));+ stores.Set(program.info.legacy_stores_mapping[attr], true);+ inst.SetArg(0, Shader::IR::Value(program.info.legacy_stores_mapping[attr]));}break;}@@ -300,7 +308,8 @@ void ConvertLegacyToGeneric(IR::Program& program, const Shader::RuntimeInfo& runununsed_input_generics.push(IR::Attribute::Generic0X + index * 4);}}- auto mappings = GenerateLegacyToGenericMappings(loads, ununsed_input_generics);+ auto mappings = GenerateLegacyToGenericMappings(+ loads, ununsed_input_generics, runtime_info.previous_stage_legacy_stores_mapping);for (IR::Block* const block : program.post_order_blocks) {for (IR::Inst& inst : block->Instructions()) {switch (inst.GetOpcode()) {diff --git a/src/shader_recompiler/runtime_info.h b/src/shader_recompiler/runtime_info.hindex dcb5ab158d..549b81ef75 100644--- a/src/shader_recompiler/runtime_info.h+++ b/src/shader_recompiler/runtime_info.h@@ -4,6 +4,7 @@#pragma once#include <array>+#include <map>#include <optional>#include <vector>@@ -60,6 +61,7 @@ struct TransformFeedbackVarying {struct RuntimeInfo {std::array<AttributeType, 32> generic_input_types{};VaryingState previous_stage_stores;+ std::map<IR::Attribute, IR::Attribute> previous_stage_legacy_stores_mapping;bool convert_depth_mode{};bool force_early_z{};diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.hindex f5690805c4..c3c586adae 100644--- a/src/shader_recompiler/shader_info.h+++ b/src/shader_recompiler/shader_info.h@@ -5,6 +5,7 @@#include <array>#include <bitset>+#include <map>#include "common/common_types.h"#include "shader_recompiler/frontend/ir/type.h"@@ -123,6 +124,8 @@ struct Info {VaryingState stores;VaryingState passthrough;+ std::map<IR::Attribute, IR::Attribute> legacy_stores_mapping;+bool loads_indexed_attributes{};std::array<bool, 8> stores_frag_color{};diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cppindex ddb70934c1..fa05b47ff6 100644--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp@@ -63,6 +63,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(const GraphicsPipelineKey& key,Shader::RuntimeInfo info;if (previous_program) {info.previous_stage_stores = previous_program->info.stores;+ info.previous_stage_legacy_stores_mapping = previous_program->info.legacy_stores_mapping;} else {// Mark all stores as available for vertex shadersinfo.previous_stage_stores.mask.set();diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 9708dc45e4..53dda50484 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -131,6 +131,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span<const Shader::IR::Program> programShader::RuntimeInfo info;if (previous_program) {info.previous_stage_stores = previous_program->info.stores;+ info.previous_stage_legacy_stores_mapping = previous_program->info.legacy_stores_mapping;if (previous_program->is_geometry_passthrough) {info.previous_stage_stores.mask |= previous_program->info.passthrough.mask;}