From 77f38c33c40d8b498dab2df448e5e31503f0f8be Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 16 Oct 2017 20:42:32 +0200 Subject: [PATCH] [dxvk] Removed DxvkDevice::createShader method --- src/dxvk/dxvk_device.cpp | 12 ------------ src/dxvk/dxvk_device.h | 15 --------------- tests/dxvk/test_dxvk_triangle.cpp | 2 +- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp index cce5a601..611d7c28 100644 --- a/src/dxvk/dxvk_device.cpp +++ b/src/dxvk/dxvk_device.cpp @@ -79,18 +79,6 @@ namespace dxvk { } - Rc DxvkDevice::createShader( - VkShaderStageFlagBits stage, - DxvkSpirvCodeBuffer&& code, - uint32_t numResourceSlots, - const DxvkResourceSlot* resourceSlots) { - return new DxvkShader(stage, - std::move(code), - numResourceSlots, - resourceSlots); - } - - Rc DxvkDevice::createSwapchain( const Rc& surface, const DxvkSwapchainProperties& properties) { diff --git a/src/dxvk/dxvk_device.h b/src/dxvk/dxvk_device.h index e6b37969..217c41b0 100644 --- a/src/dxvk/dxvk_device.h +++ b/src/dxvk/dxvk_device.h @@ -125,21 +125,6 @@ namespace dxvk { */ Rc createSemaphore(); - /** - * \brief Creates a shader module - * - * \param [in] stage Shader stage - * \param [in] code SPIR-V code - * \param [in] numResourceSlots Resource slot count - * \param [in] resourceSlots Resource slot array - * \returns Shader module - */ - Rc createShader( - VkShaderStageFlagBits stage, - DxvkSpirvCodeBuffer&& code, - uint32_t numResourceSlots, - const DxvkResourceSlot* resourceSlots); - /** * \brief Creates a swap chain * diff --git a/tests/dxvk/test_dxvk_triangle.cpp b/tests/dxvk/test_dxvk_triangle.cpp index eab6ae15..107e6fd6 100644 --- a/tests/dxvk/test_dxvk_triangle.cpp +++ b/tests/dxvk/test_dxvk_triangle.cpp @@ -57,7 +57,7 @@ public: DxvkSpirvCodeBuffer code(std::ifstream("comp.spv", std::ios::binary)); code.store(std::ofstream("comp.2.spv", std::ios::binary)); - m_compShader = m_dxvkDevice->createShader( + m_compShader = new DxvkShader( VK_SHADER_STAGE_COMPUTE_BIT, std::move(code), 1, &computeBufferSlot); }