raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-25 12:26:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

shader: parse vertex metadata once when a shader is mapped

Browse Source
This commit is contained in:
nmzik
2026-10-24 05:44:46 +02:00
parent dbc7b8b2ff
commit 8291cfeb04
6 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ShaderVertexMetadataTests.cpp
+3 -6
View File
@@ -40,9 +40,7 @@ void CheckRejected(const ShaderMappedData& data, const char* text) {
output.vertex_buffer_reg = 37;
output.vertex_attrib_reg = 41;
output.input_semantics = prior_semantics;
std::string error;
Check(!ShaderReadVertexMetadata(data, 64, output, &error), text);
Check(!error.empty(), "metadata rejection omitted its diagnostic");
Check(ShaderReadVertexMetadata(data, 64, output) != nullptr, text);
Check(output.vertex_buffer_reg == 37 && output.vertex_attrib_reg == 41 &&
output.input_semantics.data() == prior_semantics.data() &&
output.input_semantics.size() == prior_semantics.size(),
@@ -52,8 +50,7 @@ void CheckRejected(const ShaderMappedData& data, const char* text) {
void TestValidAndInvalidMetadata() {
Fixture fixture;
ShaderVertexMetadata output;
std::string error;
Check(ShaderReadVertexMetadata(fixture.mapped, 64, output, &error),
Check(ShaderReadVertexMetadata(fixture.mapped, 64, output) == nullptr,
"valid AGC vertex metadata was rejected");
Check(output.vertex_buffer_reg == 2 && output.vertex_attrib_reg == 4 &&
output.input_semantics.size() == 1,
@@ -64,7 +61,7 @@ void TestValidAndInvalidMetadata() {
AGC_ILLEGAL_DIRECT_OFFSET;
buffer_only.mapped.input_semantics = nullptr;
buffer_only.mapped.num_input_semantics = 0;
Check(ShaderReadVertexMetadata(buffer_only.mapped, 64, output, &error),
Check(ShaderReadVertexMetadata(buffer_only.mapped, 64, output) == nullptr,
"vertex-buffer-only AGC metadata was rejected");
Check(output.vertex_buffer_reg == 2 && output.vertex_attrib_reg == -1 &&
output.input_semantics.empty(),
tests/shaderCfgTests.cpp
+7
View File
@@ -1906,6 +1906,13 @@ void TestVertexBufferGrouping() {
input.resources[2].Base48() == input.buffers[0].addr,
"a later lower-address attribute or changed table left stale vertex offsets");
}
// The vertex table metadata is parsed when the shader is mapped.
user_data.direct_resource_count = 0;
(void)PrepareProgram(regs, HW::Context{}, HW::UserConfig{}, input);
Check(input.fetch_attrib_reg == 2, "a draw reread the vertex metadata of a mapped shader");
ShaderMapUserData(regs.es_regs.data_addr, mapped);
(void)PrepareProgram(regs, HW::Context{}, HW::UserConfig{}, input);
Check(!input.fetch_embedded, "remapping a shader kept its previous vertex metadata");
}
void TestNggVertexEntryState() {