From f9f8d3ec5c749bcbdab5a8fc2d2f919350f2423c Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 20 Jul 2021 10:22:20 -0700 Subject: Minor refactor to gfx D3D12 implementation. (#1913) * Minor refactor to gfx D3D12 implementation. - Allow more flexible collection of shader stages in a shader program. - Add `createRayTracingPipelineState` public interface. (no implementation). * Fix Vulkan initialization. Co-authored-by: Yong He --- tools/gfx/vulkan/render-vk.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools/gfx/vulkan/render-vk.cpp') diff --git a/tools/gfx/vulkan/render-vk.cpp b/tools/gfx/vulkan/render-vk.cpp index 64263887d..bc0271aa6 100644 --- a/tools/gfx/vulkan/render-vk.cpp +++ b/tools/gfx/vulkan/render-vk.cpp @@ -5612,9 +5612,11 @@ SlangResult VKDevice::initialize(const Desc& desc) SlangResult initDeviceResult = SLANG_OK; for (int forceSoftware = 0; forceSoftware <= 1; forceSoftware++) { - if (m_module.init(forceSoftware != 0) != SLANG_OK) + initDeviceResult = m_module.init(forceSoftware != 0); + if (initDeviceResult != SLANG_OK) continue; - if (m_api.initGlobalProcs(m_module) != SLANG_OK) + initDeviceResult = m_api.initGlobalProcs(m_module); + if (initDeviceResult != SLANG_OK) continue; descriptorSetAllocator.m_api = &m_api; initDeviceResult = initVulkanInstanceAndDevice(ENABLE_VALIDATION_LAYER != 0); -- cgit v1.2.3