Factor out a loadShaderCode() function

external/Vulkan/base/VulkanTools.cpp

@@ -310,6 +310,20 @@ namespace vks
 			exitFatal(message, (int32_t)resultCode);
 		}
 
+		VkShaderModule loadShaderCode(const char *shaderCode, size_t size, VkDevice device) {
+			assert(size > 0);
+
+			VkShaderModule shaderModule;
+			VkShaderModuleCreateInfo moduleCreateInfo{};
+			moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
+			moduleCreateInfo.codeSize = size;
+			moduleCreateInfo.pCode = (uint32_t*)shaderCode;
+
+			VK_CHECK_RESULT(vkCreateShaderModule(device, &moduleCreateInfo, NULL, &shaderModule));
+
+			return shaderModule;
+		}
+
 #if defined(__ANDROID__)
 		// Android shaders are stored as assets in the apk
 		// So they need to be loaded via the asset manager
@@ -325,15 +339,7 @@ namespace vks
 			AAsset_read(asset, shaderCode, size);
 			AAsset_close(asset);
 
-			VkShaderModule shaderModule;
-			VkShaderModuleCreateInfo moduleCreateInfo;
-			moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
-			moduleCreateInfo.pNext = NULL;
-			moduleCreateInfo.codeSize = size;
-			moduleCreateInfo.pCode = (uint32_t*)shaderCode;
-			moduleCreateInfo.flags = 0;
-
-			VK_CHECK_RESULT(vkCreateShaderModule(device, &moduleCreateInfo, NULL, &shaderModule));
+			VkShaderModule shaderModule = loadShaderCode(shaderCode, size, device);
 
 			delete[] shaderCode;
 
@@ -354,13 +360,7 @@ namespace vks
 
 				assert(size > 0);
 
-				VkShaderModule shaderModule;
-				VkShaderModuleCreateInfo moduleCreateInfo{};
-				moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
-				moduleCreateInfo.codeSize = size;
-				moduleCreateInfo.pCode = (uint32_t*)shaderCode;
-
-				VK_CHECK_RESULT(vkCreateShaderModule(device, &moduleCreateInfo, NULL, &shaderModule));
+				VkShaderModule shaderModule = loadShaderCode(shaderCode, size, device);
 
 				delete[] shaderCode;
 

external/Vulkan/base/VulkanTools.h

@@ -116,6 +116,9 @@ namespace vks
 		void exitFatal(const std::string& message, int32_t exitCode);
 		void exitFatal(const std::string& message, VkResult resultCode);
 
+		// Load a SPIR-V shader (binary, from a string)
+		VkShaderModule loadShaderCode(const char *shaderCode, size_t size, VkDevice device);
+
 		// Load a SPIR-V shader (binary)
 #if defined(__ANDROID__)
 		VkShaderModule loadShader(AAssetManager* assetManager, const char *fileName, VkDevice device);