From 77f38c33c40d8b498dab2df448e5e31503f0f8be Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
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 cce5a601d..611d7c286 100644
--- a/src/dxvk/dxvk_device.cpp
+++ b/src/dxvk/dxvk_device.cpp
@@ -79,18 +79,6 @@ namespace dxvk {
}
- Rc<DxvkShader> DxvkDevice::createShader(
- VkShaderStageFlagBits stage,
- DxvkSpirvCodeBuffer&& code,
- uint32_t numResourceSlots,
- const DxvkResourceSlot* resourceSlots) {
- return new DxvkShader(stage,
- std::move(code),
- numResourceSlots,
- resourceSlots);
- }
-
-
Rc<DxvkSwapchain> DxvkDevice::createSwapchain(
const Rc<DxvkSurface>& surface,
const DxvkSwapchainProperties& properties) {
diff --git a/src/dxvk/dxvk_device.h b/src/dxvk/dxvk_device.h
index e6b37969c..217c41b0e 100644
--- a/src/dxvk/dxvk_device.h
+++ b/src/dxvk/dxvk_device.h
@@ -125,21 +125,6 @@ namespace dxvk {
*/
Rc<DxvkSemaphore> 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<DxvkShader> 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 eab6ae151..107e6fd69 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);
}