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

shader: preserve export vectors instead of rebuilding scalar components

Browse Source
This commit is contained in:
nmzik
2026-10-09 02:42:43 +02:00
parent ee4dd90649
commit b4853a0e08
2 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/shader/recompiler/backend/spirv/spirvEmitterFlow.cpp
+32 -36
View File
@@ -304,50 +304,46 @@ uint32_t ExportVector(ValueEmitContext& ctx, uint32_t data, const IR::ExportInfo
f32[0], f32[1], f32[2], f32[3]); f32[0], f32[1], f32[2], f32[3]);
return vector; return vector;
} }
uint32_t raw[4] = { if (exp.compr || exp.en != 0xfu) {
ConstantU32(state, 0), uint32_t raw[4] = {
ConstantU32(state, 0), ConstantU32(state, 0),
ConstantU32(state, 0), ConstantU32(state, 0),
ConstantU32(state, uint_output ? 1u : 0x3f800000u), ConstantU32(state, 0),
}; ConstantU32(state, uint_output ? 1u : 0x3f800000u),
if (exp.compr) { };
for (uint32_t pair = 0; pair < 2u; pair++) { if (exp.compr) {
if ((exp.en & (3u << (pair * 2u))) == 0u) { for (uint32_t pair = 0; pair < 2u; pair++) {
continue; if ((exp.en & (3u << (pair * 2u))) == 0u) {
}
const auto packed = ExportRawComponent(ctx, data, pair);
for (uint32_t lane = 0; lane < 2u; lane++) {
const auto component = pair * 2u + lane;
if (((exp.en >> component) & 1u) == 0u) {
continue; continue;
} }
raw[component] = state.builder.AllocateId(); const auto packed = ExportRawComponent(ctx, data, pair);
state.builder.AddFunction(spv::OpBitFieldUExtract, TypeU32(state), raw[component], for (uint32_t lane = 0; lane < 2u; lane++) {
packed, ConstantU32(state, lane * 16u), const auto component = pair * 2u + lane;
ConstantU32(state, 16)); if (((exp.en >> component) & 1u) == 0u) {
} continue;
} }
} else { raw[component] = state.builder.AllocateId();
for (uint32_t component = 0; component < 4u; component++) { state.builder.AddFunction(spv::OpBitFieldUExtract, TypeU32(state), raw[component],
if (((exp.en >> component) & 1u) != 0u) { packed, ConstantU32(state, lane * 16u),
raw[component] = ExportRawComponent(ctx, data, component); ConstantU32(state, 16));
}
}
} else {
for (uint32_t component = 0; component < 4u; component++) {
if (((exp.en >> component) & 1u) != 0u) {
raw[component] = ExportRawComponent(ctx, data, component);
}
} }
} }
data = state.builder.AllocateId();
state.builder.AddFunction(spv::OpCompositeConstruct, TypeU32Vector(state, 4), data,
raw[0], raw[1], raw[2], raw[3]);
} }
if (uint_output) { if (uint_output) {
const auto vector = state.builder.AllocateId(); return data;
state.builder.AddFunction(spv::OpCompositeConstruct, TypeU32Vector(state, 4), vector,
raw[0], raw[1], raw[2], raw[3]);
return vector;
}
uint32_t f32[4] {};
for (uint32_t component = 0; component < 4u; component++) {
f32[component] = state.builder.AllocateId();
state.builder.AddFunction(spv::OpBitcast, TypeF32(state), f32[component], raw[component]);
} }
const auto vector = state.builder.AllocateId(); const auto vector = state.builder.AllocateId();
state.builder.AddFunction(spv::OpCompositeConstruct, TypeF32Vector(state, 4), vector, f32[0], state.builder.AddFunction(spv::OpBitcast, TypeF32Vector(state, 4), vector, data);
f32[1], f32[2], f32[3]);
return vector; return vector;
} }
tests/shaderCfgTests.cpp
+3 -2
View File
@@ -12826,7 +12826,7 @@ void TestNewShaderRecompilerExpPixelOutputs() {
options.input_info.pixel = &default_info; options.input_info.pixel = &default_info;
auto partial_result = RecompileForTest(partial_shader, options); auto partial_result = RecompileForTest(partial_shader, options);
const auto partial_source = DisassembleSpirvBinary(partial_result.spirv); const auto partial_source = DisassembleSpirvBinary(partial_result.spirv);
Check(SpirvSourceHasInstructionOperand(partial_source, "OpBitcast", Check(SpirvSourceHasInstructionOperand(partial_source, "OpCompositeConstruct",
"%uint_1065353216"), "%uint_1065353216"),
"disabled float alpha export did not default to 1.0f bits"); "disabled float alpha export did not default to 1.0f bits");
CheckSpirvBinaryValidates(partial_result.spirv); CheckSpirvBinaryValidates(partial_result.spirv);
@@ -13228,8 +13228,9 @@ void TestLogicalAlphaBlendExport() {
const auto source = DisassembleSpirvBinary(guest.spirv); const auto source = DisassembleSpirvBinary(guest.spirv);
Check(source.find("OpDecorate %out_mrt_1 Location 0") != std::string::npos && Check(source.find("OpDecorate %out_mrt_1 Location 0") != std::string::npos &&
source.find("OpDecorate %out_mrt_1 Index 1") != std::string::npos && source.find("OpDecorate %out_mrt_1 Index 1") != std::string::npos &&
CountSourceOccurrences(source, "OpStore %out_mrt_0 ") == 1 &&
CountSourceOccurrences(source, "OpStore %out_mrt_1 ") == 1 && CountSourceOccurrences(source, "OpStore %out_mrt_1 ") == 1 &&
SpirvInstructionOpcodeCount(guest.spirv, 81u) == 8u, !SpirvContainsVectorShuffle(guest.spirv, {3u, 3u, 3u, 3u}),
"guest dual-source export was replaced by synthetic alpha"); "guest dual-source export was replaced by synthetic alpha");
} }