Skip to content

fix(shader): pass clip distances through the rect-list stages as the vertex shader writes them #7334

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 18, 2026
+48 −7
Merged

fix(shader): pass clip distances through the rect-list stages as the vertex shader writes them #7334

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
32 changes: 32 additions & 0 deletions core/libs/prx/libSceAgcDriver/tests/Graphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6042,6 +6042,23 @@ void registeredReadableCoverTests() {
::operator delete(memory, std::align_val_t{block});
}

std::size_t VariableBuiltIns(const ShaderRecompiler::RecompileResult& result, spv::BuiltIn builtin) {
std::size_t count = 0;
const auto& words = result.spirv.Words();
for (std::size_t at = 5; at < words.size() && (words[at] >> 16u) != 0; at += words[at] >> 16u) {
if (static_cast<spv::Op>(words[at] & 0xffffu) == spv::OpDecorate && (words[at] >> 16u) == 4u && words[at + 2] == spv::DecorationBuiltIn && words[at + 3] == builtin) ++count;
}
return count;
}

bool MemberBuiltIn(const ShaderRecompiler::RecompileResult& result, spv::BuiltIn builtin) {
const auto& words = result.spirv.Words();
for (std::size_t at = 5; at < words.size() && (words[at] >> 16u) != 0; at += words[at] >> 16u) {
if (static_cast<spv::Op>(words[at] & 0xffffu) == spv::OpMemberDecorate && words[at + 3] == spv::DecorationBuiltIn && words[at + 4] == builtin) return true;
}
return false;
}

void rectListTests() {
using namespace ShaderRecompiler;
using namespace AgcDriver::Graphics;
Expand Down Expand Up @@ -6075,6 +6092,21 @@ void rectListTests() {
expectFailure([&] { ValidateShaders(shaders, state, VkPhysicalDeviceSubgroupProperties{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES}, false); }, "stage count");
}
}
{
RecompileResult clipped;
clipped.spirv = makeModule({.clipDistanceLength = 2});
const std::array<std::uint32_t, 3> clipCapabilities{spv::CapabilityShader, spv::CapabilityTessellation, spv::CapabilityClipDistance};
auto clipTarget = target;
clipTarget.supportedCapabilities = clipCapabilities;
auto clippedRect = BuildRectListShaders(clipped, fragment, clipTarget);
for (const auto* stage : {&clippedRect.control, &clippedRect.lastVertexControl, &clippedRect.evaluation}) {
Require(!MemberBuiltIn(*stage, spv::BuiltInClipDistance) && VariableBuiltIns(*stage, spv::BuiltInClipDistance) == 2u, "a rect-list stage does not take and forward the vertex clip distances through variables of their own, as the vertex shader writes them");
}
const std::array<CompiledShader, 4> clippedShaders{{{ShaderStage::Vertex, &clipped, 0}, {ShaderStage::TessellationControl, &clippedRect.control, 0}, {ShaderStage::TessellationEvaluation, &clippedRect.evaluation, 0}, {ShaderStage::Fragment, &fragment, 0}}};
auto queue = makeState();
queue.userConfig[0x242] = 17;
ValidateShaders(clippedShaders, DecodeState(queue), VkPhysicalDeviceSubgroupProperties{VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES}, false, false, false, false, false, false, true);
}
vertex.spirv = makeModule({.parameterOutput = true});
fragment.spirv = makeModule({.fragment = true, .rectParameters = true});
vertex.parameterExports = {0};
Expand Down
23 changes: 16 additions & 7 deletions core/shader/recompiler/SpirvBackend/src/RectListShaders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@ class RectListEmitter {
vec4FloatType = type(spv::OpTypeVector, floatType, 4u);
functionType = type(spv::OpTypeFunction, voidType);

perVertexType = builder.DecoratedType(spv::OpTypeStruct, {{spv::OpMemberDecorate, {0u, spv::DecorationBuiltIn, spv::BuiltInPosition}}, {spv::OpMemberDecorate, {0u, spv::DecorationInvariant}}, {spv::OpDecorate, {spv::DecorationBlock}}}, vec4FloatType);
if (clipDistances != 0u) {
clipArrayType = array(floatType, clipDistances);
perVertexType = builder.DecoratedType(spv::OpTypeStruct, {{spv::OpMemberDecorate, {0u, spv::DecorationBuiltIn, spv::BuiltInPosition}}, {spv::OpMemberDecorate, {0u, spv::DecorationInvariant}}, {spv::OpMemberDecorate, {1u, spv::DecorationBuiltIn, spv::BuiltInClipDistance}}, {spv::OpDecorate, {spv::DecorationBlock}}}, vec4FloatType, clipArrayType);
ptrInputClip = pointer(spv::StorageClassInput, clipArrayType);
ptrOutputClip = pointer(spv::StorageClassOutput, clipArrayType);
} else {
perVertexType = builder.DecoratedType(spv::OpTypeStruct, {{spv::OpMemberDecorate, {0u, spv::DecorationBuiltIn, spv::BuiltInPosition}}, {spv::OpMemberDecorate, {0u, spv::DecorationInvariant}}, {spv::OpDecorate, {spv::DecorationBlock}}}, vec4FloatType);
}

ptrInputVec4Float = pointer(spv::StorageClassInput, vec4FloatType);
Expand Down Expand Up @@ -126,8 +124,8 @@ class RectListEmitter {
store(access(ptrOutputVec4Float, glOut, invocation, intConstant(0)), position);
if (clipDistances != 0u) {
std::array<std::uint32_t, 3> clips {};
for (std::uint32_t i = 0; i < clips.size(); i++) clips[i] = load(clipArrayType, access(ptrInputClip, glIn, intConstant(i), intConstant(1)));
const auto own = load(clipArrayType, access(ptrInputClip, glIn, index, intConstant(1)));
for (std::uint32_t i = 0; i < clips.size(); i++) clips[i] = load(clipArrayType, access(ptrInputClip, clipIn, intConstant(i)));
const auto own = load(clipArrayType, access(ptrInputClip, clipIn, index));
std::vector<std::uint32_t> values;
for (std::uint32_t k = 0; k < clipDistances; k++) {
auto sum = constant(floatType, 0);
Expand All @@ -136,7 +134,7 @@ class RectListEmitter {
}
const auto clip = builder.AllocateId();
builder.AddFunction(spv::OpCompositeConstruct, clipArrayType, clip, std::span<const std::uint32_t>(values));
store(access(ptrOutputClip, glOut, invocation, intConstant(1)), clip);
store(access(ptrOutputClip, clipOut, invocation), clip);
}

for (std::uint32_t i = 0; i < parameters.size(); i++) {
Expand Down Expand Up @@ -171,7 +169,7 @@ class RectListEmitter {

const auto position = load(vec4FloatType, access(ptrInputVec4Float, glIn, index, intConstant(0)));
store(access(ptrOutputVec4Float, glOut, intConstant(0)), position);
if (clipDistances != 0u) store(access(ptrOutputClip, glOut, intConstant(1)), load(clipArrayType, access(ptrInputClip, glIn, index, intConstant(1))));
if (clipDistances != 0u) store(clipOut, load(clipArrayType, access(ptrInputClip, clipIn, index)));
for (std::uint32_t i = 0; i < parameters.size(); i++) {
store(outputs[i], load(vec4FloatType, access(ptrInputVec4Float, inputs[i], index)));
}
Expand Down Expand Up @@ -287,6 +285,12 @@ class RectListEmitter {
return variable;
}

std::uint32_t clipVariable(spv::StorageClass storage, std::uint32_t type) {
const auto variable = addInterface(storage, type);
decorate(variable, spv::DecorationBuiltIn, spv::BuiltInClipDistance);
return variable;
}

void decorate(std::uint32_t target, spv::Decoration decoration, std::uint32_t value) {
builder.AddAnnotation(spv::OpDecorate, target, decoration, value);
}
Expand Down Expand Up @@ -320,6 +324,7 @@ class RectListEmitter {
decorate(tessCoord, spv::DecorationBuiltIn, spv::BuiltInTessCoord);
}
glIn = addInterface(spv::StorageClassInput, array(perVertexType, tessControl ? 3u : 4u));
if (clipDistances != 0u) clipIn = clipVariable(spv::StorageClassInput, array(clipArrayType, tessControl ? 3u : 4u));

inputs.resize(parameters.size());
std::array<std::uint32_t, 32> locations {};
Expand All @@ -340,6 +345,7 @@ class RectListEmitter {
const auto tessControl = model == spv::ExecutionModelTessellationControl;
if (tessControl) {
glOut = addInterface(spv::StorageClassOutput, array(perVertexType, 4u));
if (clipDistances != 0u) clipOut = clipVariable(spv::StorageClassOutput, array(clipArrayType, 4u));
tessInner = addInterface(spv::StorageClassOutput, array(floatType, 2u));
decorate(tessInner, spv::DecorationBuiltIn, spv::BuiltInTessLevelInner);
builder.AddAnnotation(spv::OpDecorate, tessInner, spv::DecorationPatch);
Expand All @@ -348,6 +354,7 @@ class RectListEmitter {
builder.AddAnnotation(spv::OpDecorate, tessOuter, spv::DecorationPatch);
} else {
glOut = addInterface(spv::StorageClassOutput, perVertexType);
if (clipDistances != 0u) clipOut = clipVariable(spv::StorageClassOutput, clipArrayType);
}

outputs.resize(parameters.size());
Expand Down Expand Up @@ -394,6 +401,8 @@ class RectListEmitter {
std::uint32_t ptrOutputVec4Float = 0;
std::uint32_t glIn = 0;
std::uint32_t glOut = 0;
std::uint32_t clipIn = 0;
std::uint32_t clipOut = 0;
std::uint32_t tessInner = 0;
std::uint32_t tessOuter = 0;
std::uint32_t tessCoord = 0;
Expand Down
Loading