image view binding

Author: ccsdu2004

demo/main-texture.cpp

@@ -39,10 +39,6 @@ void onFrameSizeChanged(int width, int height)
     pipeline->getDynamicState()->applyDynamicViewport({0, 0, (float)width, (float)height, 0, 1});
 }
 
-void clear_(VkImage image, VkCommandBuffer command);
-
-
-
 int main()
 {
     VK_ContextConfig config;
@@ -94,16 +90,13 @@ int main()
 
     auto image = context->createImage("../images/cat.png");
 
-    // transitionImageLayout(image->getImage(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, 0);
-
     auto command = context->getCommandPool()->beginSingleTimeCommands();
-    clear_(image->getImage(), command);
     context->getCommandPool()->endSingleTimeCommands(command, context->getGraphicQueue());
 
     auto imageViewCreateInfo = VK_ImageView::createImageViewCreateInfo(image->getImage(),
                                VK_FORMAT_R8G8B8A8_SRGB);
     auto imageView = context->createImageView(imageViewCreateInfo);
-    shaderSet->addImageView(imageView);
+    shaderSet->addImageView(imageView, 1);
 
     context->initVulkanContext();
     pipeline = context->createPipeline(shaderSet);
@@ -121,282 +114,3 @@ int main()
 
     return 0;
 }
-
-void clear_(VkImage image, VkCommandBuffer command)
-{
-    /*VkImageMemoryBarrier textureBarrier = {};
-    textureBarrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-    textureBarrier.pNext = NULL;
-    textureBarrier.srcAccessMask = VK_ACCESS_SHADER_READ_BIT;
-    textureBarrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-    textureBarrier.oldLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-    textureBarrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;//VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-    textureBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    textureBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    textureBarrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-    textureBarrier.subresourceRange.baseMipLevel = 0;
-    textureBarrier.subresourceRange.levelCount = 1;
-    textureBarrier.subresourceRange.baseArrayLayer = 0;
-    textureBarrier.subresourceRange.layerCount = 1;
-    textureBarrier.image = image;
-    vkCmdPipelineBarrier(command, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 0, NULL, 1,
-                         &textureBarrier);
-
-    std::cout << 111 << std::endl;*/
-
-    VkImageSubresourceRange srRange = {};
-    srRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-    srRange.baseMipLevel = 0;
-    srRange.levelCount = VK_REMAINING_MIP_LEVELS;
-    srRange.baseArrayLayer = 0;
-    srRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
-
-    VkClearColorValue clearColor;
-    clearColor.float32[0] = 0.0f;
-    clearColor.float32[1] = 1.0f;
-    clearColor.float32[2] = 0.0f;
-    clearColor.float32[3] = 1.0f;
-    vkCmdClearColorImage(command, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &clearColor, 1, &srRange);
-
-}
-
-/*
-void set_image_layout(VkCommandBuffer command, VkImage image, VkImageAspectFlags aspectMask, VkImageLayout old_image_layout,
-                      VkImageLayout new_image_layout, VkPipelineStageFlags src_stages, VkPipelineStageFlags dest_stages)
-{
-    VkImageMemoryBarrier image_memory_barrier = {};
-    image_memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-    image_memory_barrier.pNext = NULL;
-    image_memory_barrier.srcAccessMask = 0;
-    image_memory_barrier.dstAccessMask = 0;
-    image_memory_barrier.oldLayout = old_image_layout;
-    image_memory_barrier.newLayout = new_image_layout;
-    image_memory_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    image_memory_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
-    image_memory_barrier.image = image;
-    image_memory_barrier.subresourceRange.aspectMask = aspectMask;
-    image_memory_barrier.subresourceRange.baseMipLevel = 0;
-    image_memory_barrier.subresourceRange.levelCount = 1;
-    image_memory_barrier.subresourceRange.baseArrayLayer = 0;
-    image_memory_barrier.subresourceRange.layerCount = 1;
-
-    switch (old_image_layout) {
-        case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
-            image_memory_barrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-            break;
-
-        case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
-            image_memory_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-            break;
-
-        case VK_IMAGE_LAYOUT_PREINITIALIZED:
-            image_memory_barrier.srcAccessMask = VK_ACCESS_HOST_WRITE_BIT;
-            break;
-
-        default:
-            break;
-    }
-
-    switch (new_image_layout) {
-        case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
-            image_memory_barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-            break;
-
-        case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL:
-            image_memory_barrier.dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT;
-            break;
-
-        case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
-            image_memory_barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
-            break;
-
-        case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL:
-            image_memory_barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-            break;
-
-        case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
-            image_memory_barrier.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
-            break;
-
-        default:
-            break;
-    }
-
-    vkCmdPipelineBarrier(command, src_stages, dest_stages, 0, 0, NULL, 0, NULL, 1, &image_memory_barrier);
-}
-
-
-void write_ppm(VK_Context* context, VkImage image)
-{
-    string filename;
-    VkResult res;
-
-    auto width = context->getSwapChainExtent().width;
-    auto height = context->getSwapChainExtent().height;
-    auto format = context->getSwapChainFormat();
-    auto device = context->getDevice();
-
-    VkImageCreateInfo image_create_info = {};
-    image_create_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
-    image_create_info.pNext = NULL;
-    image_create_info.imageType = VK_IMAGE_TYPE_2D;
-    image_create_info.format = context->getSwapChainFormat();
-    image_create_info.extent.width = width;
-    image_create_info.extent.height = height;
-    image_create_info.extent.depth = 1;
-    image_create_info.mipLevels = 1;
-    image_create_info.arrayLayers = 1;
-    image_create_info.samples = VK_SAMPLE_COUNT_1_BIT;
-    image_create_info.tiling = VK_IMAGE_TILING_LINEAR;
-    image_create_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-    image_create_info.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT;
-    image_create_info.queueFamilyIndexCount = 0;
-    image_create_info.pQueueFamilyIndices = NULL;
-    image_create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
-    image_create_info.flags = 0;
-
-    VkMemoryAllocateInfo mem_alloc = {};
-    mem_alloc.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
-    mem_alloc.pNext = NULL;
-    mem_alloc.allocationSize = 0;
-    mem_alloc.memoryTypeIndex = 0;
-
-    VkImage mappableImage;
-    VkDeviceMemory mappableMemory;
-
-    res = vkCreateImage(device, &image_create_info, NULL, &mappableImage);
-    assert(res == VK_SUCCESS);
-
-    VkMemoryRequirements mem_reqs;
-    vkGetImageMemoryRequirements(device, mappableImage, &mem_reqs);
-
-    mem_alloc.allocationSize = mem_reqs.size;
-
-    res = vkAllocateMemory(device, &mem_alloc, NULL, &(mappableMemory));
-    assert(res == VK_SUCCESS);
-
-
-    res = vkBindImageMemory(device, mappableImage, mappableMemory, 0);
-    assert(res == VK_SUCCESS);
-
-    auto command = context->getCommandPool()->beginSingleTimeCommands();
-
-    set_image_layout(command, mappableImage, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
-                     VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
-
-    set_image_layout(command, image, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
-                     VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
-
-    VkImageCopy copy_region;
-    copy_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-    copy_region.srcSubresource.mipLevel = 0;
-    copy_region.srcSubresource.baseArrayLayer = 0;
-    copy_region.srcSubresource.layerCount = 1;
-    copy_region.srcOffset.x = 0;
-    copy_region.srcOffset.y = 0;
-    copy_region.srcOffset.z = 0;
-    copy_region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-    copy_region.dstSubresource.mipLevel = 0;
-    copy_region.dstSubresource.baseArrayLayer = 0;
-    copy_region.dstSubresource.layerCount = 1;
-    copy_region.dstOffset.x = 0;
-    copy_region.dstOffset.y = 0;
-    copy_region.dstOffset.z = 0;
-    copy_region.extent.width = width;
-    copy_region.extent.height = height;
-    copy_region.extent.depth = 1;
-
-    vkCmdCopyImage(command, image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, mappableImage,
-                   VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copy_region);
-
-    set_image_layout(command, mappableImage, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_GENERAL,
-                     VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_HOST_BIT);
-*/
-
-/*
-res = vkEndCommandBuffer(command);
-assert(res == VK_SUCCESS);
-const VkCommandBuffer cmd_bufs[] = {command};
-VkFenceCreateInfo fenceInfo;
-VkFence cmdFence;
-fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
-fenceInfo.pNext = NULL;
-fenceInfo.flags = 0;
-vkCreateFence(device, &fenceInfo, NULL, &cmdFence);
-
-VkSubmitInfo submit_info[1] = {};
-submit_info[0].pNext = NULL;
-submit_info[0].sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
-submit_info[0].waitSemaphoreCount = 0;
-submit_info[0].pWaitSemaphores = NULL;
-submit_info[0].pWaitDstStageMask = NULL;
-submit_info[0].commandBufferCount = 1;
-submit_info[0].pCommandBuffers = cmd_bufs;
-submit_info[0].signalSemaphoreCount = 0;
-submit_info[0].pSignalSemaphores = NULL;
-
-res = vkQueueSubmit(context->getGraphicQueue(), 1, submit_info, cmdFence);
-assert(res == VK_SUCCESS);
-
-do {
-    res = vkWaitForFences(device, 1, &cmdFence, VK_TRUE, ~0);
-} while (res == VK_TIMEOUT);
-assert(res == VK_SUCCESS);
-*/
-/*
-context->getCommandPool()->endSingleTimeCommands(command, context->getGraphicQueue());
-
-//vkDestroyFence(device, cmdFence, NULL);
-
-filename = "2.ppm";
-
-VkImageSubresource subres = {};
-subres.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-subres.mipLevel = 0;
-subres.arrayLayer = 0;
-VkSubresourceLayout sr_layout;
-vkGetImageSubresourceLayout(device, mappableImage, &subres, &sr_layout);
-
-char *ptr;
-res = vkMapMemory(device, mappableMemory, 0, mem_reqs.size, 0, (void **)&ptr);
-assert(res == VK_SUCCESS);
-
-ptr += sr_layout.offset;
-std::ofstream file(filename.c_str(), ios::binary);
-
-file << "P6\n";
-file << width << " ";
-file << height << "\n";
-file << 255 << "\n";
-
-for (size_t y = 0; y < height; y++)
-{
-    const int *row = (const int *)ptr;
-    int swapped;
-
-    if (format == VK_FORMAT_B8G8R8A8_UNORM || format == VK_FORMAT_B8G8R8A8_SRGB) {
-        for (size_t x = 0; x < width; x++) {
-            swapped = (*row & 0xff00ff00) | (*row & 0x000000ff) << 16 | (*row & 0x00ff0000) >> 16;
-            file.write((char *)&swapped, 3);
-            row++;
-        }
-    } else if (format == VK_FORMAT_R8G8B8A8_UNORM) {
-        for (size_t x = 0; x < width; x++) {
-            file.write((char *)row, 3);
-            row++;
-        }
-    } else {
-        printf("Unrecognized image format - will not write image files");
-        break;
-    }
-
-    ptr += sr_layout.rowPitch;
-}
-
-file.close();
-vkUnmapMemory(device, mappableMemory);
-vkDestroyImage(device, mappableImage, NULL);
-vkFreeMemory(device, mappableMemory, NULL);
-}
-*/
-

include/VK_ImageView.h

@@ -6,10 +6,10 @@
 class VK_ImageView : public VK_Deleter
 {
 public:
-    static VkImageViewCreateInfo createImageViewCreateInfo(VkImage image, VkFormat format,uint32_t mipLevels = 1);
+    static VkImageViewCreateInfo createImageViewCreateInfo(VkImage image, VkFormat format, uint32_t mipLevels = 1);
 
     virtual void setSampler(VkSampler sampler) = 0;
-    virtual VkWriteDescriptorSet createWriteDescriptorSet(VkDescriptorSet descriptorSet)const = 0;
+    virtual VkWriteDescriptorSet createWriteDescriptorSet(VkDescriptorSet descriptorSet, uint32_t binding = 1)const = 0;
     virtual VkImageView getImageView()const = 0;
 };
 

include/VK_ShaderSet.h

@@ -43,7 +43,7 @@ class VK_ShaderSet : public VK_Deleter
     virtual void initUniformBuffer() = 0;
     virtual void clearUniformBuffer() = 0;
 
-    virtual void addImageView(VK_ImageView *imageView) = 0;
+    virtual void addImageView(VK_ImageView *imageView, uint32_t binding = 1) = 0;
 public:
     virtual bool isValid() = 0;
     virtual VkPipelineShaderStageCreateInfo *getCreateInfoData() = 0;

source/VK_ContextImpl.cpp

@@ -758,7 +758,7 @@ bool VK_ContextImpl::createSwapChainImageViews()
 
         VK_ImageViewImpl *view = new VK_ImageViewImpl(this);
         view->setRemoveFromContainerWhenRelease(false);
-        if (!view->create(viewCreateInfo, 1)) {
+        if (!view->create(viewCreateInfo)) {
             std::cerr << "failed to create image views" << std::endl;
             return false;
         }
@@ -888,7 +888,7 @@ VK_ImageView *VK_ContextImpl::createImageView(const VkImageViewCreateInfo &viewC
         uint32_t mipLevels)
 {
     auto imageView = new VK_ImageViewImpl(this);
-    if (!imageView->create(viewCreateInfo, mipLevels)) {
+    if (!imageView->create(viewCreateInfo)) {
         delete imageView;
         return nullptr;
     }
@@ -1009,7 +1009,7 @@ void VK_ContextImpl::createColorResources()
     auto createInfo = VK_ImageView::createImageViewCreateInfo(vkColorImage->getImage(), colorFormat);
     createInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
     vkColorImageView = new VK_ImageViewImpl(this);
-    vkColorImageView->create(createInfo, 1);
+    vkColorImageView->create(createInfo);
 }
 
 void VK_ContextImpl::createDepthResources()
@@ -1027,7 +1027,7 @@ void VK_ContextImpl::createDepthResources()
     auto createInfo = VK_ImageView::createImageViewCreateInfo(vkDepthImage->getImage(), depthFormat);
     createInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
     vkDepthImageView = new VK_ImageViewImpl(this);
-    vkDepthImageView->create(createInfo, 1);
+    vkDepthImageView->create(createInfo);
 }
 
 bool VK_ContextImpl::createCommandBuffers()

source/VK_DescriptorSets.cpp

@@ -31,15 +31,15 @@ void VK_DescriptorSets::init(VkDescriptorPool pool, VkDescriptorSetLayout setLay
 }
 
 void VK_DescriptorSets::update(const std::list<VK_UniformBuffer *> &uniformBuffers,
-                               const std::list<VK_ImageView *> &imageViews)
+                               const std::map<VK_ImageView *, uint32_t> &imageViews)
 {
     for (size_t i = 0; i < context->getSwapImageCount(); i++) {
         std::vector<VkWriteDescriptorSet> descriptorWrites;
         for (auto buffer : uniformBuffers)
             descriptorWrites.push_back(buffer->createWriteDescriptorSet(i, descriptorSets[i]));
 
         for (auto imageView : imageViews) {
-            descriptorWrites.push_back(imageView->createWriteDescriptorSet(descriptorSets[i]));
+            descriptorWrites.push_back(imageView.first->createWriteDescriptorSet(descriptorSets[i], imageView.second));
         }
 
         vkUpdateDescriptorSets(context->getDevice(), descriptorWrites.size(), &descriptorWrites[0], 0,