From 1f80c0643d087aba635b3b33914f8f4398c0f103 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 15 Feb 2023 15:47:00 +0000 Subject: [PATCH] Silently handle unsupported resources in DXIL reflection if encountered --- renderdoc/driver/shaders/dxil/dxil_reflect.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/shaders/dxil/dxil_reflect.cpp b/renderdoc/driver/shaders/dxil/dxil_reflect.cpp index 89b957795..c2c2553b4 100644 --- a/renderdoc/driver/shaders/dxil/dxil_reflect.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_reflect.cpp @@ -659,19 +659,21 @@ static void AddResourceBind(DXBC::Reflection *refl, const TypeInfo &typeInfo, co { case ResourceKind::Unknown: case ResourceKind::SamplerComparison: - case ResourceKind::RTAccelerationStructure: case ResourceKind::CBuffer: case ResourceKind::Sampler: - case ResourceKind::FeedbackTexture2D: - case ResourceKind::FeedbackTexture2DArray: RDCERR("Unexpected %s shape %u", srv ? "SRV" : "UAV", shape); defName = srv ? "SRV" : "UAV"; break; + case ResourceKind::RTAccelerationStructure: + RDCWARN("CS or PS with RT use, not reflected"); + break; case ResourceKind::Texture1D: bind.type = srv ? ShaderInputBind::TYPE_TEXTURE : ShaderInputBind::TYPE_UAV_RWTYPED; defName = srv ? "Texture1D" : "RWTexture1D"; bind.dimension = ShaderInputBind::DIM_TEXTURE1D; break; + case ResourceKind::FeedbackTexture2D: + // fallthrough, resource type unhandled right now case ResourceKind::Texture2D: bind.type = srv ? ShaderInputBind::TYPE_TEXTURE : ShaderInputBind::TYPE_UAV_RWTYPED; defName = srv ? "Texture2D" : "RWTexture2D"; @@ -697,6 +699,8 @@ static void AddResourceBind(DXBC::Reflection *refl, const TypeInfo &typeInfo, co defName = srv ? "Texture1DArray" : "RWTexture1DArray"; bind.dimension = ShaderInputBind::DIM_TEXTURE1DARRAY; break; + case ResourceKind::FeedbackTexture2DArray: + // fallthrough, resource type unhandled right now case ResourceKind::Texture2DArray: bind.type = srv ? ShaderInputBind::TYPE_TEXTURE : ShaderInputBind::TYPE_UAV_RWTYPED; defName = srv ? "Texture2DArray" : "RWTexture2DArray";