From 4cd317bcae0a13dc2bbb78448c8d60cd1dcc76bd Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 14 Feb 2019 11:24:40 -0500 Subject: Fix for Dx12 to stop crash when dxil cannot be handled by driver (#851) * If there is a problem with initialize RenderTestApp::initialize constructing the pipeline, this was not being reported as an error causing a later crash. * Use same style to return error. --- tools/render-test/render-test-main.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp index 7dde38ae6..d3a7acf37 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -332,7 +332,8 @@ SlangResult RenderTestApp::initialize(Renderer* renderer, ShaderCompiler* shader } } - return SLANG_OK; + // If success must have a pipeline state + return m_pipelineState ? SLANG_OK : SLANG_FAIL; } Result RenderTestApp::initializeShaders(ShaderCompiler* shaderCompiler) @@ -388,12 +389,8 @@ Result RenderTestApp::initializeShaders(ShaderCompiler* shaderCompiler) } compileRequest.entryPointTypeArguments = m_shaderInputLayout.globalTypeArguments; m_shaderProgram = shaderCompiler->compileProgram(compileRequest); - if (!m_shaderProgram) - { - return SLANG_FAIL; - } - return SLANG_OK; + return m_shaderProgram ? SLANG_OK : SLANG_FAIL; } void RenderTestApp::renderFrame() -- cgit v1.2.3