From 4d593fe34ff89ce13882e47ccd95881ef4743c6b Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 7 Feb 2019 18:04:46 -0500 Subject: Hotfix/remove null this work around (#831) * Re-enable warnings around null this. * Remove testing for nullptr in Substitution::Equals tests * Fix ref counting problem in vulkan render. * * Remove SLANG_ASSERT(this) in mthods * Place asserts conservatively at method call sites where appropriate. --- tools/gfx/render-vk.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/gfx/render-vk.cpp') diff --git a/tools/gfx/render-vk.cpp b/tools/gfx/render-vk.cpp index 32bc91de4..e291c7e9c 100644 --- a/tools/gfx/render-vk.cpp +++ b/tools/gfx/render-vk.cpp @@ -2505,7 +2505,7 @@ void VKRenderer::setDescriptorSet(PipelineType pipelineType, PipelineLayout* lay Result VKRenderer::createProgram(const ShaderProgram::Desc& desc, ShaderProgram** outProgram) { - ShaderProgramImpl* impl = new ShaderProgramImpl(desc.pipelineType); + RefPtr impl = new ShaderProgramImpl(desc.pipelineType); if( desc.pipelineType == PipelineType::Compute) { auto computeKernel = desc.findKernel(StageType::Compute); @@ -2519,7 +2519,7 @@ Result VKRenderer::createProgram(const ShaderProgram::Desc& desc, ShaderProgram* impl->m_vertex = compileEntryPoint(*vertexKernel, VK_SHADER_STAGE_VERTEX_BIT, impl->m_buffers[0]); impl->m_fragment = compileEntryPoint(*fragmentKernel, VK_SHADER_STAGE_FRAGMENT_BIT, impl->m_buffers[1]); } - *outProgram = impl; + *outProgram = impl.detach(); return SLANG_OK; } -- cgit v1.2.3