Skip to content

fix(agc): skip registration-time preparation for unsupported shader types #1893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oneandonlydean merged 1 commit into from
Oct 10, 2026
Merged

fix(agc): skip registration-time preparation for unsupported shader types #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/libs/prx/libSceAgcDriver/Execution/src/Driver/Shaders/ShaderRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,12 @@ std::vector<PreparedShaders::Entry> PrepareRegistered(const ShaderSnapshot& snap
case 5: stage = Stage::Local; programRegister = 0x148; resourceRegister = 0x10b; firstUser = 8; break;
case 6: stage = Stage::Mesh; programRegister = 0x088; resourceRegister = 0x08b; break;
case 7: stage = Stage::TessellationControl; programRegister = 0x108; resourceRegister = 0x10b; break;
default: throw std::runtime_error("AGC driver: unsupported registered shader type");
default:
if (registration) {
APS5_LOG_ERR("Shader 0x%llx has unsupported registered shader type %u; it is not prepared at registration", static_cast<unsigned long long>(snapshot.codeAddress), static_cast<unsigned>(snapshot.type));
return {};
}
throw std::runtime_error("AGC driver: unsupported registered shader type " + std::to_string(snapshot.type));
}
const auto high = RegisterValue(state.shader, programRegister + 1);
if ((high & ~0xffu) != 0) throw std::runtime_error("AGC driver: invalid registered program address");
Expand Down
19 changes: 19 additions & 0 deletions core/libs/prx/libSceAgcDriver/tests/execution/PreparedShaders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,26 @@ void PrepareMultisampledStorage(AgcDriver::VulkanDevice& device) {
ExpectFailure([&] { static_cast<void>(PrepareShader(request)); }, "storage image multisampling is unavailable on the target device");
}

void UnsupportedTypeRegistration() {
alignas(256) static const std::array<std::uint32_t, 1> code{0xbf810000u};
struct Header {
Shader shader{};
std::array<ShaderRegister, 8> registers{{{0, 0x1218}, {1, 0x40104004}, {2, 0xa0}, {5, 0}, {3, 6}, {4, 0xc}, {6, 0}, {7, 0}}};
} header;
header.shader.file_header = 0x34333231u;
header.shader.version = 0x18;
header.shader.header_size = sizeof(header);
header.shader.shader_size = sizeof(code);
header.shader.code = code.data();
header.shader.sh_registers = header.registers.data();
header.shader.num_sh_registers = header.registers.size();
header.shader.type = 8;
AgcDriverRegisterShader_nid_postfix(&header.shader);
AgcDriverRegisterShader_nid_postfix(&header.shader);
}

void Registration(bool indirect) {
UnsupportedTypeRegistration();
alignas(256) std::array<std::uint32_t, 1> code{0xbf810000u};
struct Header {
Shader shader{};
Expand Down
Loading