dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-07-10 10:14:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1f82b24a6b into bffa4d1b63

Browse Source
This commit is contained in:
Marcin Mikołajczyk 2026-07-10 00:37:30 +01:00 committed by GitHub
commit b2c1b28e2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shader_recompiler/backend/spirv/emit_spirv.cpp
View File

@ -307,10 +307,14 @@ void SetupCapabilities(const Info& info, const Profile& profile, const RuntimeIn
} else if (profile.supports_fragment_shader_barycentric) {
ctx.AddExtension("SPV_KHR_fragment_shader_barycentric");
ctx.AddCapability(spv::Capability::FragmentBarycentricKHR);
ctx.AddCapability(spv::Capability::InterpolationFunction);
}
if (info.loads.Get(IR::Attribute::SampleIndex) ||
runtime_info.fs_info.addr_flags.linear_sample_ena ||
runtime_info.fs_info.addr_flags.persp_sample_ena) {
runtime_info.fs_info.addr_flags.persp_sample_ena ||
(!profile.supports_amd_shader_explicit_vertex_parameter &&
profile.supports_fragment_shader_barycentric &&
info.loads.Get(IR::Attribute::BaryCoordSmoothSample))) {
ctx.AddCapability(spv::Capability::SampleRateShading);
}
if (info.loads.GetAny(IR::Attribute::RenderTargetIndex)) {

32
src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
View File

@ -128,15 +128,33 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, u32 comp, u32 index) {
return ctx.OpLoad(ctx.F32[1],
ctx.OpAccessChain(ctx.input_f32, ctx.tess_coord, ctx.ConstU32(1U)));
case IR::Attribute::BaryCoordSmooth:
return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth,
ctx.ConstU32(comp)));
if (ctx.profile.supports_amd_shader_explicit_vertex_parameter) {
return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth,
ctx.ConstU32(comp)));
} else {
return ctx.OpCompositeExtract(ctx.F32[1], ctx.OpLoad(ctx.F32[3], ctx.bary_coord), comp);
}
case IR::Attribute::BaryCoordSmoothCentroid:
return ctx.OpLoad(
ctx.F32[1],
ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth_centroid, ctx.ConstU32(comp)));
if (ctx.profile.supports_amd_shader_explicit_vertex_parameter) {
return ctx.OpLoad(ctx.F32[1],
ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth_centroid,
ctx.ConstU32(comp)));
} else {
return ctx.OpCompositeExtract(
ctx.F32[1], ctx.OpInterpolateAtCentroid(ctx.F32[3], ctx.bary_coord), comp);
}
case IR::Attribute::BaryCoordSmoothSample:
return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth_sample,
ctx.ConstU32(comp)));
if (ctx.profile.supports_amd_shader_explicit_vertex_parameter) {
return ctx.OpLoad(
ctx.F32[1],
ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth_sample, ctx.ConstU32(comp)));
} else {
return ctx.OpCompositeExtract(
ctx.F32[1],
ctx.OpInterpolateAtSample(ctx.F32[3], ctx.bary_coord,
ctx.OpLoad(ctx.U32[1], ctx.sample_index)),
comp);
}
case IR::Attribute::BaryCoordNoPersp:
return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_nopersp,
ctx.ConstU32(comp)));

20
src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
View File

@ -356,8 +356,8 @@ void EmitContext::DefineInputs() {
if (profile.supports_amd_shader_explicit_vertex_parameter) {
bary_coord_smooth = DefineVariable(F32[2], spv::BuiltIn::BaryCoordSmoothAMD,
spv::StorageClass::Input);
} else if (profile.supports_fragment_shader_barycentric) {
bary_coord_smooth =
} else if (profile.supports_fragment_shader_barycentric && !ValidId(bary_coord)) {
bary_coord =
DefineVariable(F32[3], spv::BuiltIn::BaryCoordKHR, spv::StorageClass::Input);
}
}
@ -365,20 +365,24 @@ void EmitContext::DefineInputs() {
if (profile.supports_amd_shader_explicit_vertex_parameter) {
bary_coord_smooth_centroid = DefineVariable(
F32[2], spv::BuiltIn::BaryCoordSmoothCentroidAMD, spv::StorageClass::Input);
} else if (profile.supports_fragment_shader_barycentric) {
bary_coord_smooth_centroid =
} else if (profile.supports_fragment_shader_barycentric && !ValidId(bary_coord)) {
bary_coord =
DefineVariable(F32[3], spv::BuiltIn::BaryCoordKHR, spv::StorageClass::Input);
// Decorate(bary_coord_smooth_centroid, spv::Decoration::Centroid);
}
}
if (info.loads.GetAny(IR::Attribute::BaryCoordSmoothSample)) {
if (profile.supports_amd_shader_explicit_vertex_parameter) {
bary_coord_smooth_sample = DefineVariable(
F32[2], spv::BuiltIn::BaryCoordSmoothSampleAMD, spv::StorageClass::Input);
} else if (profile.supports_fragment_shader_barycentric) {
bary_coord_smooth_sample =
} else if (profile.supports_fragment_shader_barycentric && !ValidId(bary_coord)) {
bary_coord =
DefineVariable(F32[3], spv::BuiltIn::BaryCoordKHR, spv::StorageClass::Input);
// Decorate(bary_coord_smooth_sample, spv::Decoration::Sample);
// we would need sample_index to interpolate the bary_coord later
if (!ValidId(sample_index)) {
sample_index =
DefineVariable(U32[1], spv::BuiltIn::SampleId, spv::StorageClass::Input);
Decorate(sample_index, spv::Decoration::Flat);
}
}
}
if (info.loads.GetAny(IR::Attribute::BaryCoordNoPersp)) {

1
src/shader_recompiler/backend/spirv/spirv_emit_context.h
View File

@ -285,6 +285,7 @@ public:
Id shared_memory_u32_type{};
Id shared_memory_u64_type{};
Id bary_coord{};
Id bary_coord_smooth{};
Id bary_coord_smooth_centroid{};
Id bary_coord_smooth_sample{};