Changed folder structure and refactored CMakeLists.txt file.

Project/Tutorials/06/Data/frag.spv.txt

@@ -0,0 +1,46 @@
+Tutorial06/Data06/shader.frag
+Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
+
+
+Linked fragment stage:
+
+
+// Module Version 10000
+// Generated by (magic number): 80001
+// Id's are bound by 20
+
+                              Capability Shader
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main" 9 17
+                              ExecutionMode 4 OriginLowerLeft
+                              Source GLSL 450
+                              Name 4  "main"
+                              Name 9  "o_Color"
+                              Name 13  "u_Texture"
+                              Name 17  "v_Texcoord"
+                              Decorate 9(o_Color) Location 0
+                              Decorate 13(u_Texture) DescriptorSet 0
+                              Decorate 13(u_Texture) Binding 0
+                              Decorate 17(v_Texcoord) Location 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 32
+               7:             TypeVector 6(float) 4
+               8:             TypePointer Output 7(fvec4)
+      9(o_Color):      8(ptr) Variable Output
+              10:             TypeImage 6(float) 2D sampled format:Unknown
+              11:             TypeSampledImage 10
+              12:             TypePointer UniformConstant 11
+   13(u_Texture):     12(ptr) Variable UniformConstant
+              15:             TypeVector 6(float) 2
+              16:             TypePointer Input 15(fvec2)
+  17(v_Texcoord):     16(ptr) Variable Input
+         4(main):           2 Function None 3
+               5:             Label
+              14:          11 Load 13(u_Texture)
+              18:   15(fvec2) Load 17(v_Texcoord)
+              19:    7(fvec4) ImageSampleImplicitLod 14 18
+                              Store 9(o_Color) 19
+                              Return
+                              FunctionEnd

Project/Tutorials/06/Data/shader.frag

@@ -0,0 +1,21 @@
+// Copyright 2016 Intel Corporation All Rights Reserved
+// 
+// Intel makes no representations about the suitability of this software for any purpose.
+// THIS SOFTWARE IS PROVIDED ""AS IS."" INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
+// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES,
+// FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY
+// RIGHTS, AND INCLUDING THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+// Intel does not assume any responsibility for any errors which may appear in this software
+// nor any responsibility to update it.
+
+#version 450
+
+layout(set=0, binding=0) uniform sampler2D u_Texture;
+
+layout(location = 0) in vec2 v_Texcoord;
+
+layout(location = 0) out vec4 o_Color;
+
+void main() {
+  o_Color = texture( u_Texture, v_Texcoord );
+}

Project/Tutorials/06/Data/shader.vert

@@ -0,0 +1,26 @@
+// Copyright 2016 Intel Corporation All Rights Reserved
+// 
+// Intel makes no representations about the suitability of this software for any purpose.
+// THIS SOFTWARE IS PROVIDED ""AS IS."" INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
+// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES,
+// FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY
+// RIGHTS, AND INCLUDING THE WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+// Intel does not assume any responsibility for any errors which may appear in this software
+// nor any responsibility to update it.
+
+#version 450
+
+layout(location = 0) in vec4 i_Position;
+layout(location = 1) in vec2 i_Texcoord;
+
+out gl_PerVertex
+{
+  vec4 gl_Position;
+};
+
+layout(location = 0) out vec2 v_Texcoord;
+
+void main() {
+    gl_Position = i_Position;
+    v_Texcoord = i_Texcoord;
+}

Project/Tutorials/06/Data/vert.spv.txt

@@ -0,0 +1,54 @@
+Tutorial06/Data06/shader.vert
+Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
+
+
+Linked vertex stage:
+
+
+// Module Version 10000
+// Generated by (magic number): 80001
+// Id's are bound by 24
+
+                              Capability Shader
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Vertex 4  "main" 10 14 20 22
+                              Source GLSL 450
+                              Name 4  "main"
+                              Name 8  "gl_PerVertex"
+                              MemberName 8(gl_PerVertex) 0  "gl_Position"
+                              Name 10  ""
+                              Name 14  "i_Position"
+                              Name 20  "v_Texcoord"
+                              Name 22  "i_Texcoord"
+                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
+                              Decorate 8(gl_PerVertex) Block
+                              Decorate 14(i_Position) Location 0
+                              Decorate 20(v_Texcoord) Location 0
+                              Decorate 22(i_Texcoord) Location 1
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 32
+               7:             TypeVector 6(float) 4
+ 8(gl_PerVertex):             TypeStruct 7(fvec4)
+               9:             TypePointer Output 8(gl_PerVertex)
+              10:      9(ptr) Variable Output
+              11:             TypeInt 32 1
+              12:     11(int) Constant 0
+              13:             TypePointer Input 7(fvec4)
+  14(i_Position):     13(ptr) Variable Input
+              16:             TypePointer Output 7(fvec4)
+              18:             TypeVector 6(float) 2
+              19:             TypePointer Output 18(fvec2)
+  20(v_Texcoord):     19(ptr) Variable Output
+              21:             TypePointer Input 18(fvec2)
+  22(i_Texcoord):     21(ptr) Variable Input
+         4(main):           2 Function None 3
+               5:             Label
+              15:    7(fvec4) Load 14(i_Position)
+              17:     16(ptr) AccessChain 10 12
+                              Store 17 15
+              23:   18(fvec2) Load 22(i_Texcoord)
+                              Store 20(v_Texcoord) 23
+                              Return
+                              FunctionEnd

Project/Tutorials/06/Tutorial06.h

@@ -0,0 +1,173 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2017 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License.  You may obtain a copy
+// of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+// License for the specific language governing permissions and limitations
+// under the License.
+////////////////////////////////////////////////////////////////////////////////
+
+#if !defined(TUTORIAL_06_HEADER)
+#define TUTORIAL_06_HEADER
+
+#include "VulkanCommon.h"
+#include "Tools.h"
+
+namespace ApiWithoutSecrets {
+
+  // ************************************************************ //
+  // BufferParameters                                             //
+  //                                                              //
+  // Vulkan Buffer's parameters container class                   //
+  // ************************************************************ //
+  struct BufferParameters {
+    VkBuffer                        Handle;
+    VkDeviceMemory                  Memory;
+    uint32_t                        Size;
+
+    BufferParameters() :
+      Handle( VK_NULL_HANDLE ),
+      Memory( VK_NULL_HANDLE ),
+      Size( 0 ) {
+    }
+  };
+
+  // ************************************************************ //
+  // DescriptorParameters                                         //
+  //                                                              //
+  // Container class for descriptor related resources             //
+  // ************************************************************ //
+  struct DescriptorSetParameters {
+    VkDescriptorPool                Pool;
+    VkDescriptorSetLayout           Layout;
+    VkDescriptorSet                 Handle;
+
+    DescriptorSetParameters() :
+      Pool( VK_NULL_HANDLE ),
+      Layout( VK_NULL_HANDLE ),
+      Handle( VK_NULL_HANDLE ) {
+    }
+  };
+
+  // ************************************************************ //
+  // VertexData                                                   //
+  //                                                              //
+  // Struct describing data type and format of vertex attributes  //
+  // ************************************************************ //
+  struct VertexData {
+    float   x, y, z, w;
+    float   u, v;
+  };
+
+  // ************************************************************ //
+  // RenderingResourcesData                                       //
+  //                                                              //
+  // Struct containing data used during rendering process         //
+  // ************************************************************ //
+  struct RenderingResourcesData {
+    VkFramebuffer                         Framebuffer;
+    VkCommandBuffer                       CommandBuffer;
+    VkSemaphore                           ImageAvailableSemaphore;
+    VkSemaphore                           FinishedRenderingSemaphore;
+    VkFence                               Fence;
+
+    RenderingResourcesData() :
+      Framebuffer( VK_NULL_HANDLE ),
+      CommandBuffer( VK_NULL_HANDLE ),
+      ImageAvailableSemaphore( VK_NULL_HANDLE ),
+      FinishedRenderingSemaphore( VK_NULL_HANDLE ),
+      Fence( VK_NULL_HANDLE ) {
+    }
+  };
+
+  // ************************************************************ //
+  // VulkanTutorial04Parameters                                   //
+  //                                                              //
+  // Vulkan specific parameters                                   //
+  // ************************************************************ //
+  struct VulkanTutorial06Parameters {
+    VkRenderPass                          RenderPass;
+    ImageParameters                       Image;
+    DescriptorSetParameters               DescriptorSet;
+    VkPipelineLayout                      PipelineLayout;
+    VkPipeline                            GraphicsPipeline;
+    BufferParameters                      VertexBuffer;
+    BufferParameters                      StagingBuffer;
+    VkCommandPool                         CommandPool;
+    std::vector<RenderingResourcesData>   RenderingResources;
+
+    static const size_t                   ResourcesCount = 3;
+
+    VulkanTutorial06Parameters() :
+      RenderPass( VK_NULL_HANDLE ),
+      Image(),
+      DescriptorSet(),
+      PipelineLayout(),
+      GraphicsPipeline( VK_NULL_HANDLE ),
+      VertexBuffer(),
+      StagingBuffer(),
+      CommandPool( VK_NULL_HANDLE ),
+      RenderingResources( ResourcesCount ) {
+    }
+  };
+
+  // ************************************************************ //
+  // Tutorial04                                                   //
+  //                                                              //
+  // Class for presenting Vulkan usage topics                     //
+  // ************************************************************ //
+  class Tutorial06 : public VulkanCommon {
+  public:
+    Tutorial06();
+    ~Tutorial06();
+
+    bool    CreateRenderingResources();
+    bool    CreateStagingBuffer();
+    bool    CreateTexture();
+    bool    CreateDescriptorSetLayout();
+    bool    CreateDescriptorPool();
+    bool    AllocateDescriptorSet();
+    bool    UpdateDescriptorSet();
+    bool    CreateRenderPass();
+    bool    CreatePipelineLayout();
+    bool    CreatePipeline();
+    bool    CreateVertexBuffer();
+
+    bool    Draw() override;
+
+  private:
+    VulkanTutorial06Parameters  Vulkan;
+
+    bool                                                              CreateCommandBuffers();
+    bool                                                              CreateCommandPool(uint32_t queue_family_index, VkCommandPool *pool);
+    bool                                                              AllocateCommandBuffers(VkCommandPool pool, uint32_t count, VkCommandBuffer *command_buffers);
+    bool                                                              CreateSemaphores();
+    bool                                                              CreateFences();
+    bool                                                              CreateBuffer(VkBufferUsageFlags usage, VkMemoryPropertyFlagBits memoryProperty, BufferParameters &buffer);
+    bool                                                              AllocateBufferMemory(VkBuffer buffer, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory);
+    bool                                                              CreateImage( uint32_t width, uint32_t height, VkImage *image );
+    bool                                                              AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory );
+    bool                                                              CreateImageView( ImageParameters &image_parameters );
+    bool                                                              CreateSampler( VkSampler *sampler );
+    bool                                                              CopyTextureData( char *texture_data, uint32_t data_size, uint32_t width, uint32_t height );
+    Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule>     CreateShaderModule( const char* filename );
+    const std::vector<float>&                                         GetVertexData() const;
+    bool                                                              CopyVertexData();
+    bool                                                              PrepareFrame( VkCommandBuffer command_buffer, const ImageParameters &image_parameters, VkFramebuffer &framebuffer );
+    bool                                                              CreateFramebuffer( VkFramebuffer &framebuffer, VkImageView image_view );
+    void                                                              DestroyBuffer( BufferParameters& buffer );
+
+    bool                                                              ChildOnWindowSizeChanged() override;
+    void                                                              ChildClear() override;
+  };
+
+} // namespace ApiWithoutSecrets
+
+#endif // TUTORIAL_06_HEADER

Project/Tutorials/06/main.cpp

@@ -0,0 +1,74 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2017 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License.  You may obtain a copy
+// of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+// License for the specific language governing permissions and limitations
+// under the License.
+////////////////////////////////////////////////////////////////////////////////
+
+#include "Tutorial06.h"
+
+int main( int argc, char **argv ) {
+  ApiWithoutSecrets::OS::Window window;
+  ApiWithoutSecrets::Tutorial06 tutorial06;
+
+  // Window creation
+  if( !window.Create( "06 - Descriptor Sets" ) ) {
+    return -1;
+  }
+
+  // Vulkan preparations and initialization
+  if( !tutorial06.PrepareVulkan( window.GetParameters() ) ) {
+    return -1;
+  }
+
+  // Tutorial 06
+  if( !tutorial06.CreateRenderingResources() ) {
+    return -1;
+  }
+  if( !tutorial06.CreateStagingBuffer() ) {
+    return -1;
+  }
+  if( !tutorial06.CreateTexture() ) {
+    return -1;
+  }
+  if( !tutorial06.CreateDescriptorSetLayout() ) {
+    return -1;
+  }
+  if( !tutorial06.CreateDescriptorPool() ) {
+    return -1;
+  }
+  if( !tutorial06.AllocateDescriptorSet() ) {
+    return -1;
+  }
+  if( !tutorial06.UpdateDescriptorSet() ) {
+    return -1;
+  }
+  if( !tutorial06.CreateRenderPass() ) {
+    return -1;
+  }
+  if( !tutorial06.CreatePipelineLayout() ) {
+    return -1;
+  }
+  if( !tutorial06.CreatePipeline() ) {
+    return -1;
+  }
+  if( !tutorial06.CreateVertexBuffer() ) {
+    return -1;
+  }
+
+  // Rendering loop
+  if( !window.RenderingLoop( tutorial06 ) ) {
+    return -1;
+  }
+
+  return 0;
+}