From 81eaec1f5f29c24999cdd56f42fa3fc57755ab17 Mon Sep 17 00:00:00 2001 From: azhirnov Date: Fri, 26 Feb 2021 22:03:12 +0300 Subject: Added PSO creation failure tests for mesh & ray tracing pipelines, fixed ray tracing pipeline validation. --- Graphics/GraphicsEngine/include/PipelineStateBase.hpp | 3 --- Graphics/GraphicsEngine/src/PipelineStateBase.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp index 4ceb08a8..5d1e65e9 100644 --- a/Graphics/GraphicsEngine/include/PipelineStateBase.hpp +++ b/Graphics/GraphicsEngine/include/PipelineStateBase.hpp @@ -554,9 +554,6 @@ protected: if (ShaderStages[GetShaderTypePipelineIndex(SHADER_TYPE_RAY_GEN, PIPELINE_TYPE_RAY_TRACING)].Count() == 0) LOG_ERROR_AND_THROW("At least one shader with type SHADER_TYPE_RAY_GEN must be provided."); - if (ShaderStages[GetShaderTypePipelineIndex(SHADER_TYPE_RAY_MISS, PIPELINE_TYPE_RAY_TRACING)].Count() == 0) - LOG_ERROR_AND_THROW("At least one shader with type SHADER_TYPE_RAY_MISS must be provided."); - // Remove empty stages for (auto iter = ShaderStages.begin(); iter != ShaderStages.end();) { diff --git a/Graphics/GraphicsEngine/src/PipelineStateBase.cpp b/Graphics/GraphicsEngine/src/PipelineStateBase.cpp index 57fc1ae3..c1a314a6 100644 --- a/Graphics/GraphicsEngine/src/PipelineStateBase.cpp +++ b/Graphics/GraphicsEngine/src/PipelineStateBase.cpp @@ -449,7 +449,7 @@ void ValidateRayTracingPipelineCreateInfo(IRenderDevice* pDevice, Uint32 MaxRecu { case SHADER_TYPE_RAY_GEN: case SHADER_TYPE_RAY_MISS: - case SHADER_TYPE_RAY_CLOSEST_HIT: break; + case SHADER_TYPE_CALLABLE: break; default: LOG_PSO_ERROR_AND_THROW(GetShaderTypeLiteralName(Group.pShader->GetDesc().ShaderType), " is not a valid type for ray tracing general shader."); } -- cgit v1.2.3