feat(linux): add combined image sampler

Author: Pacheco95

README.md

@@ -1,4 +1,4 @@
-# Linux ❘ Texture mapping ❘ Image view and sampler
+# Linux ❘ Texture mapping ❘ Combined image sampler
 
 Summary [here](https://github.com/Pacheco95/khronos-vulkan-tutorial-cpp/tree/linux-summary).
 
@@ -7,7 +7,7 @@ Summary [here](https://github.com/Pacheco95/khronos-vulkan-tutorial-cpp/tree/lin
 # Navigation
 
 [🌐 Original tutorial](
-https://docs.vulkan.org/tutorial/latest/06_Texture_mapping/01_Image_view_and_sampler.html)
+https://docs.vulkan.org/tutorial/latest/06_Texture_mapping/02_Combined_image_sampler.html)
 
 [⏮ Texture mapping / Images](
 https://github.com/Pacheco95/khronos-vulkan-tutorial-cpp/tree/linux/05-texture-mapping/01-images)

res/shaders/shader.frag

@@ -1,9 +1,12 @@
 #version 450
 
+layout (binding = 1) uniform sampler2D texSampler;
+
 layout (location = 0) in vec3 fragColor;
+layout (location = 1) in vec2 fragTexCoord;
 
 layout (location = 0) out vec4 outColor;
 
 void main() {
-    outColor = vec4(fragColor, 1.0);
+    outColor = texture(texSampler, fragTexCoord);
 }

res/shaders/shader.vert

@@ -8,10 +8,13 @@ layout (binding = 0) uniform UniformBufferObject {
 
 layout (location = 0) in vec2 inPosition;
 layout (location = 1) in vec3 inColor;
+layout (location = 2) in vec2 inTexCoord;
 
 layout (location = 0) out vec3 fragColor;
+layout (location = 1) out vec2 fragTexCoord;
 
 void main() {
     gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
     fragColor = inColor;
+    fragTexCoord = inTexCoord;
 }

src/Application.cpp

@@ -18,10 +18,11 @@
 constexpr auto NO_TIMEOUT = std::numeric_limits<uint64_t>::max();
 
 const std::vector<Vertex> VERTICES = {
-    {{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}},
-    {{0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}},
-    {{0.5f, 0.5f}, {0.0f, 0.0f, 1.0f}},
-    {{-0.5f, 0.5f}, {1.0f, 1.0f, 1.0f}}};
+    {{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}, {1.0f, 0.0f}},
+    {{0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}, {0.0f, 0.0f}},
+    {{0.5f, 0.5f}, {0.0f, 0.0f, 1.0f}, {0.0f, 1.0f}},
+    {{-0.5f, 0.5f}, {1.0f, 1.0f, 1.0f}, {1.0f, 1.0f}}};
+
 
 const std::vector<uint16_t> INDICES = {0, 1, 2, 2, 3, 0};
 
@@ -60,6 +61,8 @@ void Application::initVulkan() {
   createFrameBuffers();
   createCommandPool();
   createTextureImage();
+  createTextureImageView();
+  createTextureSampler();
   createVertexBuffer();
   createIndexBuffer();
   createUniformBuffers();
@@ -401,8 +404,18 @@ void Application::createDescriptorSetLayout() {
           .setDescriptorType(vk::DescriptorType::eUniformBuffer)
           .setStageFlags(vk::ShaderStageFlagBits::eVertex);
 
+  const auto samplerLayoutBinding =
+      vk::DescriptorSetLayoutBinding()
+          .setBinding(1)
+          .setDescriptorCount(1)
+          .setDescriptorType(vk::DescriptorType::eCombinedImageSampler)
+          .setStageFlags(vk::ShaderStageFlagBits::eFragment);
+
+
+  std::array bindings = {uboLayoutBinding, samplerLayoutBinding};
+
   vk::DescriptorSetLayoutCreateInfo layoutInfo;
-  layoutInfo.setBindings(uboLayoutBinding);
+  layoutInfo.setBindings(bindings);
 
   m_descriptorSetLayout = m_device.createDescriptorSetLayout(layoutInfo);
 }
@@ -728,14 +741,21 @@ void Application::createUniformBuffers() {
 }
 
 void Application::createDescriptorPool() {
-  vk::DescriptorPoolSize poolSize;
-  poolSize.type = vk::DescriptorType::eUniformBuffer;
-  poolSize.descriptorCount =
+  const auto maxFramesInFlight =
       static_cast<uint32_t>(Config::MAX_FRAMES_IN_FLIGHT);
 
+  std::array<vk::DescriptorPoolSize, 2> poolSizes;
+
+  poolSizes[0].type = vk::DescriptorType::eUniformBuffer;
+  poolSizes[0].descriptorCount = maxFramesInFlight;
+
+  poolSizes[1].type = vk::DescriptorType::eCombinedImageSampler;
+  poolSizes[1].descriptorCount = maxFramesInFlight;
+
+
   vk::DescriptorPoolCreateInfo poolInfo;
-  poolInfo.setPoolSizes(poolSize);
-  poolInfo.maxSets = static_cast<uint32_t>(Config::MAX_FRAMES_IN_FLIGHT);
+  poolInfo.setPoolSizes(poolSizes);
+  poolInfo.maxSets = maxFramesInFlight;
 
   m_descriptorPool = m_device.createDescriptorPool(poolInfo);
 }
@@ -759,15 +779,30 @@ void Application::createDescriptorSets() {
     bufferInfo.offset = 0;
     bufferInfo.range = sizeof(UniformBufferObject);
 
-    vk::WriteDescriptorSet descriptorWrite;
-    descriptorWrite.dstSet = m_descriptorSets[i];
-    descriptorWrite.dstBinding = 0;
-    descriptorWrite.dstArrayElement = 0;
-    descriptorWrite.descriptorType = vk::DescriptorType::eUniformBuffer;
-    descriptorWrite.descriptorCount = 1;
-    descriptorWrite.setBufferInfo(bufferInfo);
+    vk::DescriptorImageInfo imageInfo;
+    imageInfo.imageLayout = vk::ImageLayout::eShaderReadOnlyOptimal;
+    imageInfo.imageView = textureImageView;
+    imageInfo.sampler = textureSampler;
+
+    std::array<vk::WriteDescriptorSet, 2> descriptorWrites;
+
+    descriptorWrites[0].dstSet = m_descriptorSets[i];
+    descriptorWrites[0].dstBinding = 0;
+    descriptorWrites[0].dstArrayElement = 0;
+    descriptorWrites[0].descriptorType = vk::DescriptorType::eUniformBuffer;
+    descriptorWrites[0].descriptorCount = 1;
+    descriptorWrites[0].pBufferInfo = &bufferInfo;
 
-    m_device.updateDescriptorSets(descriptorWrite, {});
+    descriptorWrites[1].dstSet = m_descriptorSets[i];
+    descriptorWrites[1].dstBinding = 1;
+    descriptorWrites[1].dstArrayElement = 0;
+    descriptorWrites[1].descriptorType =
+        vk::DescriptorType::eCombinedImageSampler;
+    descriptorWrites[1].descriptorCount = 1;
+    descriptorWrites[1].pImageInfo = &imageInfo;
+
+
+    m_device.updateDescriptorSets(descriptorWrites, {});
   }
 }
 
@@ -1074,7 +1109,7 @@ void Application::createImage(
   vk::MemoryRequirements memRequirements =
       m_device.getImageMemoryRequirements(image);
 
-  vk::MemoryAllocateInfo allocInfo{};
+  vk::MemoryAllocateInfo allocInfo;
   allocInfo.allocationSize = memRequirements.size;
   allocInfo.memoryTypeIndex =
       findMemoryType(memRequirements.memoryTypeBits, properties);
@@ -1091,7 +1126,7 @@ void Application::transitionImageLayout(
 ) {
   vk::CommandBuffer commandBuffer = beginSingleTimeCommands();
 
-  vk::ImageMemoryBarrier barrier{};
+  vk::ImageMemoryBarrier barrier;
   barrier.oldLayout = oldLayout;
   barrier.newLayout = newLayout;
   barrier.srcQueueFamilyIndex = vk::QueueFamilyIgnored;
@@ -1142,7 +1177,7 @@ void Application::copyBufferToImage(
 ) {
   vk::CommandBuffer commandBuffer = beginSingleTimeCommands();
 
-  vk::BufferImageCopy region{};
+  vk::BufferImageCopy region;
   region.bufferOffset = 0;
   region.bufferRowLength = 0;
   region.bufferImageHeight = 0;

src/Vertex.cpp

@@ -8,9 +8,9 @@ vk::VertexInputBindingDescription Vertex::getBindingDescription() {
   return bindingDescription;
 }
 
-std::array<vk::VertexInputAttributeDescription, 2>
+std::array<vk::VertexInputAttributeDescription, 3>
 Vertex::getAttributeDescriptions() {
-  std::array<vk::VertexInputAttributeDescription, 2> attributeDescriptions{};
+  std::array<vk::VertexInputAttributeDescription, 3> attributeDescriptions{};
 
   attributeDescriptions[0].binding = 0;
   attributeDescriptions[0].location = 0;
@@ -22,5 +22,10 @@ Vertex::getAttributeDescriptions() {
   attributeDescriptions[1].format = vk::Format::eR32G32B32Sfloat;
   attributeDescriptions[1].offset = offsetof(Vertex, color);
 
+  attributeDescriptions[2].binding = 0;
+  attributeDescriptions[2].location = 2;
+  attributeDescriptions[2].format = vk::Format::eR32G32Sfloat;
+  attributeDescriptions[2].offset = offsetof(Vertex, texCoord);
+
   return attributeDescriptions;
 }

src/Vertex.hpp

@@ -7,9 +7,10 @@
 struct Vertex {
   glm::vec2 pos;
   glm::vec3 color;
+  glm::vec2 texCoord;
 
   static vk::VertexInputBindingDescription getBindingDescription();
 
-  static std::array<vk::VertexInputAttributeDescription, 2>
+  static std::array<vk::VertexInputAttributeDescription, 3>
   getAttributeDescriptions();
 };