shader_recompiler: ignore clip distances beyond driver support level
This commit is contained in:
		@@ -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);
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -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] &&
 | 
			
		||||
 
 | 
			
		||||
@@ -87,6 +87,8 @@ struct Profile {
 | 
			
		||||
    bool has_broken_robust{};
 | 
			
		||||
 | 
			
		||||
    u64 min_ssbo_alignment{};
 | 
			
		||||
 | 
			
		||||
    u32 max_user_clip_distances{};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
} // namespace Shader
 | 
			
		||||
 
 | 
			
		||||
@@ -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,
 | 
			
		||||
 
 | 
			
		||||
@@ -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{
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user