mirror of
https://github.com/opus-tango/IntroductionToVulkan.git
synced 2026-03-20 03:55:26 +00:00
Renamed shader files and updated compile_shaders.bat batch file.
This commit is contained in:
@@ -54,7 +54,9 @@ namespace ApiWithoutSecrets {
|
||||
PresentationSurface( VK_NULL_HANDLE ),
|
||||
SwapChain( VK_NULL_HANDLE ),
|
||||
PresentQueueCmdBuffers( 0 ),
|
||||
PresentQueueCmdPool( VK_NULL_HANDLE ) {
|
||||
PresentQueueCmdPool( VK_NULL_HANDLE ),
|
||||
ImageAvailableSemaphore( VK_NULL_HANDLE ),
|
||||
RenderingFinishedSemaphore( VK_NULL_HANDLE ) {
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -148,8 +148,8 @@ namespace ApiWithoutSecrets {
|
||||
}
|
||||
|
||||
bool Tutorial03::CreatePipeline() {
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/03/vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/03/frag.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.frag.spv" );
|
||||
|
||||
if( !vertex_shader_module || !fragment_shader_module ) {
|
||||
return false;
|
||||
|
||||
@@ -145,8 +145,8 @@ namespace ApiWithoutSecrets {
|
||||
}
|
||||
|
||||
bool Tutorial04::CreatePipeline() {
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/04/vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/04/frag.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.frag.spv" );
|
||||
|
||||
if( !vertex_shader_module || !fragment_shader_module ) {
|
||||
return false;
|
||||
|
||||
@@ -229,8 +229,8 @@ namespace ApiWithoutSecrets {
|
||||
}
|
||||
|
||||
bool Tutorial05::CreatePipeline() {
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/05/vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/05/frag.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.frag.spv" );
|
||||
|
||||
if( !vertex_shader_module || !fragment_shader_module ) {
|
||||
return false;
|
||||
|
||||
@@ -605,8 +605,8 @@ namespace ApiWithoutSecrets {
|
||||
}
|
||||
|
||||
bool Tutorial06::CreatePipeline() {
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/06/vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/06/frag.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/06/shader.vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/06/shader.frag.spv" );
|
||||
|
||||
if( !vertex_shader_module || !fragment_shader_module ) {
|
||||
return false;
|
||||
|
||||
@@ -738,8 +738,8 @@ namespace ApiWithoutSecrets {
|
||||
}
|
||||
|
||||
bool Tutorial07::CreatePipeline() {
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/07/vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/07/frag.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/07/shader.vert.spv" );
|
||||
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/07/shader.frag.spv" );
|
||||
|
||||
if( !vertex_shader_module || !fragment_shader_module ) {
|
||||
return false;
|
||||
|
||||
@@ -75,6 +75,7 @@ namespace ApiWithoutSecrets {
|
||||
VulkanTutorial07Parameters() :
|
||||
RenderPass( VK_NULL_HANDLE ),
|
||||
Image(),
|
||||
UniformBuffer(),
|
||||
DescriptorSet(),
|
||||
PipelineLayout(),
|
||||
GraphicsPipeline( VK_NULL_HANDLE ),
|
||||
|
||||
Reference in New Issue
Block a user