Skip to content

fix(shader,agc): declare ImageMSArray only for multisampled arrayed storage images #9978

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 27, 2026
Merged

fix(shader,agc): declare ImageMSArray only for multisampled arrayed storage images #9978

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
6 changes: 4 additions & 2 deletions core/libs/prx/libSceAgcDriver/Execution/src/VulkanDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1706,8 +1706,10 @@ VulkanDevice::VulkanDevice(const PresentationWindow* window, bool compileOnly) :
// Recompiled storage-image access declares no format (the guest descriptor decides it).
enabled.shaderStorageImageMultisample = available.shaderStorageImageMultisample;
state->storageImageMultisample = enabled.shaderStorageImageMultisample == VK_TRUE;
if (enabled.shaderStorageImageMultisample) state->capabilities.push_back(spv::CapabilityStorageImageMultisample);
state->capabilities.push_back(spv::CapabilityImageMSArray);
if (enabled.shaderStorageImageMultisample) {
state->capabilities.push_back(spv::CapabilityStorageImageMultisample);
state->capabilities.push_back(spv::CapabilityImageMSArray);
}
enabled.shaderStorageImageWriteWithoutFormat = available.shaderStorageImageWriteWithoutFormat;
state->storageImageWriteWithoutFormat = enabled.shaderStorageImageWriteWithoutFormat == VK_TRUE;
enabled.shaderStorageImageReadWithoutFormat = available.shaderStorageImageReadWithoutFormat;
Expand Down
12 changes: 12 additions & 0 deletions core/libs/prx/libSceAgcDriver/tests/execution/SampleMultisampleTarget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "Recompiler.hpp"
#include "Optimization/ResourceProgram.hpp"
#include "VulkanTestDevice.hpp"
#include <spirv/unified1/spirv.hpp>
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX
Expand Down Expand Up @@ -382,9 +383,20 @@ void RequireStoreRefused(AgcDriver::VulkanDevice& device, const std::array<std::
Require(refusal.find(expected) != std::string::npos, what + " was not refused: " + refusal);
}

bool DeclaresCapability(std::span<const std::uint32_t> words, spv::Capability capability) {
for (std::size_t cursor = 5; cursor < words.size();) {
const auto count = words[cursor] >> 16u;
Require(count != 0u && count <= words.size() - cursor, "a SPIR-V instruction is truncated");
if ((words[cursor] & 0xffffu) == spv::OpCapability && words[cursor + 1u] == static_cast<std::uint32_t>(capability)) return true;
cursor += count;
}
return false;
}

std::vector<std::array<float, 4>> RunLoad(AgcDriver::VulkanDevice& device, const std::array<std::uint32_t, 8>& texture, bool arrayed, std::uint32_t fragments) {
std::vector<std::uint32_t> userData;
const auto program = CompileLoad(device, texture, userData, arrayed);
Require(!DeclaresCapability(program.spirv, spv::CapabilityImageMSArray), "the multisampled image_load declared ImageMSArray, which only multisampled arrayed storage images need");
std::vector<std::array<float, 4>> loaded(Side * Side * fragments);
const auto codeAddress = reinterpret_cast<std::uintptr_t>((arrayed ? ArrayLoadCode : LoadCode).data());
for (std::uint32_t first = 0; first < loaded.size(); first += Threads) {
Expand Down
2 changes: 1 addition & 1 deletion core/shader/recompiler/SpirvBackend/src/SpirvMemory/SpirvDescriptors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ std::uint32_t ImageType(SpirvEmitterState& state, const ImageResource& image) {
if (sampled == 2u) {
if (std::ranges::find(state.supportedCapabilities, spv::CapabilityStorageImageMultisample) == state.supportedCapabilities.end()) FailEmit("storage image multisampling is unavailable on the target device");
state.module.EmitCapability(spv::CapabilityStorageImageMultisample);
if (info.arrayed != 0u) state.module.EmitCapability(spv::CapabilityImageMSArray);
}
if (info.arrayed != 0u) state.module.EmitCapability(spv::CapabilityImageMSArray);
}
const auto scalar = image.atomic64 ? TypeScalarU64(state) : ImageScalarType(state, image.numericClass);
return state.module.Type(spv::OpTypeImage, scalar, info.spirvDimension, image.depthCompare ? 1u : 0u, info.arrayed, info.multisampled, sampled, format);
Expand Down
Loading