Renamed shader files and updated compile_shaders.bat batch file.

Project/Common/VulkanCommon.h

@@ -148,7 +148,6 @@ namespace ApiWithoutSecrets {
     bool                          PrepareVulkan( OS::WindowParameters parameters );
     virtual bool                  OnWindowSizeChanged() final override;
 
-  protected:
     VkPhysicalDevice              GetPhysicalDevice() const;
     VkDevice                      GetDevice() const;
 

Project/Tutorials/02/Tutorial02.h

@@ -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 ) {
     }
   };
 

Project/Tutorials/03/Tutorial03.cpp

@@ -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> vertex_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/03/frag.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;

Project/Tutorials/04/Tutorial04.cpp

@@ -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> vertex_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/04/frag.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;

Project/Tutorials/05/Tutorial05.cpp

@@ -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> vertex_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/05/frag.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;

Project/Tutorials/06/Tutorial06.cpp

@@ -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> vertex_shader_module = CreateShaderModule( "Data/Tutorials/06/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/06/frag.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;

Project/Tutorials/07/Tutorial07.cpp

@@ -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> vertex_shader_module = CreateShaderModule( "Data/Tutorials/07/shader.vert.spv" );
-    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/07/frag.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;

Project/Tutorials/07/Tutorial07.h

@@ -75,6 +75,7 @@ namespace ApiWithoutSecrets {
     VulkanTutorial07Parameters() :
       RenderPass( VK_NULL_HANDLE ),
       Image(),
+      UniformBuffer(),
       DescriptorSet(),
       PipelineLayout(),
       GraphicsPipeline( VK_NULL_HANDLE ),

Project/compile_shaders.bat

@@ -8,8 +8,14 @@ REM // Licensed under the Apache License, Version 2.0 (the "License");
REM // yo
 REM // you may not use this file except in compliance with the License.
 REM // You may obtain a copy of the License at
 REM //
-REM // http://www.apache.org/licenses/LICENSE-2.0
+REM // http://www.apache.org/licenses/LICENSE-2.0
-REM //
+REM //
+REM // Unless required by applicable law or agreed to in writing, software
+REM // distributed under the License is distributed on an "AS IS" BASIS,
+REM // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM // See the License for the specific language governing permissions and
+REM // limitations under the License.
+REM /////////////////////////////////////////////////////////////////////////////////////////////
 
 if [%1] == [] (
     echo Folder not provided! Please specify folder and shader file name without extension
@@ -33,14 +39,14 @@ if not exist %folder% (
 
 echo Could not find "glslangValidator.exe" file.
 goto end
-
+
-:convert
+:convert
-
+
 set folder=%1\Data
 
-if not exist %folder% (
+if not exist %folder% (
-    echo Could not find specified folder.
+    echo Could not find specified folder.
-    goto end
+    goto end
 )
 
 if exist %folder%\%2.vert (