raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-28 13:56:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphics: accept AGC vertex-buffer-only shaders

Browse Source
This commit is contained in:
nmzik
2026-08-16 16:54:27 +02:00
parent 93398d6d0f
commit b0bd6470f3
3 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/shader/shader.cpp
+1 -1
View File
@@ -811,7 +811,7 @@ static bool ShaderGetStaticInputInfoVS(const HW::VertexShaderInfo& regs,
return false; return false;
} }
if (metadata.vertex_buffer_reg >= 0) { if (metadata.vertex_attrib_reg >= 0) {
info.fetch_external = false; info.fetch_external = false;
info.fetch_embedded = true; info.fetch_embedded = true;
info.fetch_attrib_reg = metadata.vertex_attrib_reg; info.fetch_attrib_reg = metadata.vertex_attrib_reg;
src/graphics/shader/shaderVertexMetadata.cpp
+11 -6
View File
@@ -56,16 +56,21 @@ bool ShaderReadVertexMetadata(const ShaderMappedData& data, uint32_t max_user_sg
} }
} }
const bool embedded = next.vertex_buffer_reg >= 0 || next.vertex_attrib_reg >= 0; if (next.vertex_attrib_reg >= 0 && next.vertex_buffer_reg < 0) {
if (!embedded) { return Fail(error, "vertex attribute table requires a vertex buffer table");
}
if (next.vertex_buffer_reg < 0) {
metadata = next; metadata = next;
return true; return true;
} }
if (next.vertex_buffer_reg < 0 || next.vertex_attrib_reg < 0) { if (static_cast<uint32_t>(next.vertex_buffer_reg) + 1u >= max_user_sgprs) {
return Fail(error, "vertex buffer and attribute tables must be supplied together"); return Fail(error, "vertex table pointer exceeds the user-SGPR domain");
} }
if (static_cast<uint32_t>(next.vertex_buffer_reg) + 1u >= max_user_sgprs || if (next.vertex_attrib_reg < 0) {
static_cast<uint32_t>(next.vertex_attrib_reg) + 1u >= max_user_sgprs) { metadata = next;
return true;
}
if (static_cast<uint32_t>(next.vertex_attrib_reg) + 1u >= max_user_sgprs) {
return Fail(error, "vertex table pointer exceeds the user-SGPR domain"); return Fail(error, "vertex table pointer exceeds the user-SGPR domain");
} }
if (data.num_input_semantics == 0 || if (data.num_input_semantics == 0 ||
tests/ShaderVertexMetadataTests.cpp
+22
View File
@@ -57,6 +57,22 @@ void TestValidAndInvalidMetadata() {
output.input_semantics_count == 1, output.input_semantics_count == 1,
"valid AGC vertex metadata was decoded incorrectly"); "valid AGC vertex metadata was decoded incorrectly");
Fixture buffer_only;
buffer_only.offsets[static_cast<size_t>(AgcDirectResourceType::PtrVertexAttribDescTable)] =
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),
"vertex-buffer-only AGC metadata was rejected");
Check(output.vertex_buffer_reg == 2 && output.vertex_attrib_reg == -1 &&
output.input_semantics_count == 0,
"vertex-buffer-only AGC metadata was decoded incorrectly");
Fixture attrib_only;
attrib_only.offsets[static_cast<size_t>(AgcDirectResourceType::PtrVertexBufferTable)] =
AGC_ILLEGAL_DIRECT_OFFSET;
CheckRejected(attrib_only.mapped, "vertex-attribute-only AGC metadata was accepted");
auto missing_header = fixture.mapped; auto missing_header = fixture.mapped;
missing_header.user_data = nullptr; missing_header.user_data = nullptr;
CheckRejected(missing_header, "missing AGC user-data header was accepted"); CheckRejected(missing_header, "missing AGC user-data header was accepted");
@@ -79,6 +95,12 @@ void TestValidAndInvalidMetadata() {
63; 63;
CheckRejected(excessive_register.mapped, "out-of-domain vertex table SGPR was accepted"); CheckRejected(excessive_register.mapped, "out-of-domain vertex table SGPR was accepted");
Fixture excessive_attrib_register;
excessive_attrib_register
.offsets[static_cast<size_t>(AgcDirectResourceType::PtrVertexAttribDescTable)] = 63;
CheckRejected(excessive_attrib_register.mapped,
"out-of-domain vertex attribute table SGPR was accepted");
Fixture missing_semantics; Fixture missing_semantics;
missing_semantics.mapped.input_semantics = nullptr; missing_semantics.mapped.input_semantics = nullptr;
CheckRejected(missing_semantics.mapped, "missing vertex semantic array was accepted"); CheckRejected(missing_semantics.mapped, "missing vertex semantic array was accepted");