Browse Source

shader_recompiler: ignore clip distances beyond driver support level

nce_cpp
Liam 2 years ago
parent
commit
6611ba122b
  1. 5
      src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
  2. 2
      src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
  3. 2
      src/shader_recompiler/profile.h
  4. 1
      src/video_core/renderer_opengl/gl_shader_cache.cpp
  5. 1
      src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
  6. 4
      src/video_core/vulkan_common/vulkan_device.h

5
src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp

@ -74,6 +74,11 @@ std::optional<OutAttr> OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) {
case IR::Attribute::ClipDistance7: {
const u32 base{static_cast<u32>(IR::Attribute::ClipDistance0)};
const u32 index{static_cast<u32>(attr) - base};
if (index >= ctx.profile.max_user_clip_distances) {
LOG_WARNING(Shader, "Ignoring clip distance store {} >= {} supported", index,
ctx.profile.max_user_clip_distances);
return std::nullopt;
}
const Id clip_num{ctx.Const(index)};
return OutputAccessChain(ctx, ctx.output_f32, ctx.clip_distances, clip_num);
}

2
src/shader_recompiler/backend/spirv/spirv_emit_context.cpp

@ -1528,7 +1528,7 @@ void EmitContext::DefineOutputs(const IR::Program& program) {
if (stage == Stage::Fragment) {
throw NotImplementedException("Storing ClipDistance in fragment stage");
}
const Id type{TypeArray(F32[1], Const(8U))};
const Id type{TypeArray(F32[1], Const(std::min(8U, profile.max_user_clip_distances)))};
clip_distances = DefineOutput(*this, type, invocations, spv::BuiltIn::ClipDistance);
}
if (info.stores[IR::Attribute::Layer] &&

2
src/shader_recompiler/profile.h

@ -87,6 +87,8 @@ struct Profile {
bool has_broken_robust{};
u64 min_ssbo_alignment{};
u32 max_user_clip_distances{};
};
} // namespace Shader

1
src/video_core/renderer_opengl/gl_shader_cache.cpp

@ -233,6 +233,7 @@ ShaderCache::ShaderCache(RasterizerOpenGL& rasterizer_, Core::Frontend::EmuWindo
.ignore_nan_fp_comparisons = true,
.gl_max_compute_smem_size = device.GetMaxComputeSharedMemorySize(),
.min_ssbo_alignment = device.GetShaderStorageBufferAlignment(),
.max_user_clip_distances = 8,
},
host_info{
.support_float64 = true,

1
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@ -374,6 +374,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device
.has_broken_robust =
device.IsNvidia() && device.GetNvidiaArch() <= NvidiaArchitecture::Arch_Pascal,
.min_ssbo_alignment = device.GetStorageBufferAlignment(),
.max_user_clip_distances = device.GetMaxUserClipDistances(),
};
host_info = Shader::HostTranslateInfo{

4
src/video_core/vulkan_common/vulkan_device.h

@ -665,6 +665,10 @@ public:
return properties.properties.limits.maxViewports;
}
u32 GetMaxUserClipDistances() const {
return properties.properties.limits.maxClipDistances;
}
bool SupportsConditionalBarriers() const {
return supports_conditional_barriers;
}

Loading…
Cancel
Save