From eb39c1b8ac76d65ae69f75545a6d7260f919e070 Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Sun, 5 May 2019 14:18:35 +0200 Subject: [PATCH] Removed deprecated function Refs #576 --- base/VulkanTools.cpp | 26 -------------------------- base/VulkanTools.h | 4 ---- 2 files changed, 30 deletions(-) diff --git a/base/VulkanTools.cpp b/base/VulkanTools.cpp index 8d43d660..cfdeb824 100644 --- a/base/VulkanTools.cpp +++ b/base/VulkanTools.cpp @@ -364,32 +364,6 @@ namespace vks } #endif - VkShaderModule loadShaderGLSL(const char *fileName, VkDevice device, VkShaderStageFlagBits stage) - { - std::string shaderSrc = readTextFile(fileName); - const char *shaderCode = shaderSrc.c_str(); - size_t size = strlen(shaderCode); - assert(size > 0); - - VkShaderModule shaderModule; - VkShaderModuleCreateInfo moduleCreateInfo; - moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO; - moduleCreateInfo.pNext = NULL; - moduleCreateInfo.codeSize = 3 * sizeof(uint32_t) + size + 1; - moduleCreateInfo.pCode = (uint32_t*)malloc(moduleCreateInfo.codeSize); - moduleCreateInfo.flags = 0; - - // Magic SPV number - ((uint32_t *)moduleCreateInfo.pCode)[0] = 0x07230203; - ((uint32_t *)moduleCreateInfo.pCode)[1] = 0; - ((uint32_t *)moduleCreateInfo.pCode)[2] = stage; - memcpy(((uint32_t *)moduleCreateInfo.pCode + 3), shaderCode, size + 1); - - VK_CHECK_RESULT(vkCreateShaderModule(device, &moduleCreateInfo, NULL, &shaderModule)); - - return shaderModule; - } - bool fileExists(const std::string &filename) { std::ifstream f(filename.c_str()); diff --git a/base/VulkanTools.h b/base/VulkanTools.h index f7885987..1da5a889 100644 --- a/base/VulkanTools.h +++ b/base/VulkanTools.h @@ -124,10 +124,6 @@ namespace vks VkShaderModule loadShader(const char *fileName, VkDevice device); #endif - // Load a GLSL shader (text) - // Note: GLSL support requires vendor-specific extensions to be enabled and is not a core-feature of Vulkan - VkShaderModule loadShaderGLSL(const char *fileName, VkDevice device, VkShaderStageFlagBits stage); - /** @brief Checks if a file exists */ bool fileExists(const std::string &filename); }