diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-02-07 18:04:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-07 18:04:46 -0500 |
| commit | 4d593fe34ff89ce13882e47ccd95881ef4743c6b (patch) | |
| tree | 532fc80cb72da150647c0bd50ee1bcaf3b4bc297 /tools/gfx/render-vk.cpp | |
| parent | 2d1291ae4f3de66e2d958b148d0811cbf2ee9c60 (diff) | |
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.
Diffstat (limited to 'tools/gfx/render-vk.cpp')
| -rw-r--r-- | tools/gfx/render-vk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<ShaderProgramImpl> 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; } |
