mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-09 21:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

shader_recompiler: Support multiple attributes using the same load in vertex fetch shaders (#3475)

Browse Source 
* Support multiple uses of the same load.

Co-Authored-By: TheTurtle <47210458+raphaelthegreat@users.noreply.github.com>

* Keep base_sgpr as a s32

Requires manually casting to s32 now.

---------

Co-authored-by: TheTurtle <47210458+raphaelthegreat@users.noreply.github.com>
This commit is contained in:
Stephen Miller
2025-08-29 18:06:40 -05:00
committed by GitHub
parent 8ae45559fc
commit 412355aab4
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/shader_recompiler/frontend/fetch_shader.cpp
View File

@@ -2,7 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <algorithm> #include <algorithm>
#include <boost/container/static_vector.hpp>
#include "common/assert.h" #include "common/assert.h"
#include "shader_recompiler/frontend/decode.h" #include "shader_recompiler/frontend/decode.h"
#include "shader_recompiler/frontend/fetch_shader.h" #include "shader_recompiler/frontend/fetch_shader.h"
@@ -53,9 +52,8 @@ std::optional<FetchShaderData> ParseFetchShader(const Shader::Info& info) {
struct VsharpLoad { struct VsharpLoad {
u32 dword_offset{}; u32 dword_offset{};
s32 base_sgpr{}; s32 base_sgpr{};
s32 dst_reg{-1};
}; };
boost::container::static_vector<VsharpLoad, 16> loads; std::array<VsharpLoad, 104> loads{};
u32 semantic_index = 0; u32 semantic_index = 0;
while (!code_slice.atEnd()) { while (!code_slice.atEnd()) {
@@ -67,7 +65,8 @@ std::optional<FetchShaderData> ParseFetchShader(const Shader::Info& info) {
} }
if (inst.inst_class == InstClass::ScalarMemRd) { if (inst.inst_class == InstClass::ScalarMemRd) {
loads.emplace_back(inst.control.smrd.offset, inst.src[0].code * 2, inst.dst[0].code); loads[inst.dst[0].code] =
VsharpLoad{inst.control.smrd.offset, static_cast<s32>(inst.src[0].code) * 2};
continue; continue;
} }
@@ -92,21 +91,17 @@ std::optional<FetchShaderData> ParseFetchShader(const Shader::Info& info) {
// Find the load instruction that loaded the V# to the SPGR. // Find the load instruction that loaded the V# to the SPGR.
// This is so we can determine its index in the vertex table. // This is so we can determine its index in the vertex table.
const auto it = std::ranges::find_if( const auto it = loads[base_sgpr];
loads, [&](VsharpLoad& load) { return load.dst_reg == base_sgpr; });
auto& attrib = data.attributes.emplace_back(); auto& attrib = data.attributes.emplace_back();
attrib.semantic = semantic_index++; attrib.semantic = semantic_index++;
attrib.dest_vgpr = inst.src[1].code; attrib.dest_vgpr = inst.src[1].code;
attrib.num_elements = inst.control.mubuf.count; attrib.num_elements = inst.control.mubuf.count;
attrib.sgpr_base = it->base_sgpr; attrib.sgpr_base = it.base_sgpr;
attrib.dword_offset = it->dword_offset; attrib.dword_offset = it.dword_offset;
// Store instance id rate // Store instance id rate
attrib.instance_data = inst.src[0].code; attrib.instance_data = inst.src[0].code;
// Mark load as used.
it->dst_reg = -1;
} }
} }