add vulkan allocator and model demo

Author: ccsdu2004

CMakeLists.txt

@@ -1,12 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
 project(vulkan-demo)
-
-set(GLFW_ROOT "D:\\glfw-3.3.5.bin.WIN64")
-include_directories("C:\\VulkanSDK\\1.2.189.2\\Include")
-LINK_DIRECTORIES("C:\\VulkanSDK\\1.2.189.2\\Lib")
-LINK_DIRECTORIES("D:\\glfw-3.3.5.bin.WIN64\\lib-mingw-w64")
-
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -53,6 +47,7 @@ add_library(
      source/VK_ValidationLayer.cpp
      source/VK_ShaderSet.cpp
      source/VK_Util.cpp
+     source/VK_Allocator.cpp
      source/VK_ObjLoader.cpp
      source/VK_ObjLoader.h
      source/tiny_obj_loader.cc
@@ -71,6 +66,7 @@ set(DEMOS
     uniform-buffer2
     sampler
     texture
+    model
     model-mesh
     model-mesh-geom
     model-mesh-tess

demo/main-clear-color.cpp

@@ -13,6 +13,8 @@ VK_Context* context = nullptr;
 
 void onMouseButtonCallback(int button, int action, int mods)
 {
+    (void)button;
+    (void)mods;
     if(action)
         context->setClearColor(0, 1, 0, 1);
     else

demo/main-model.cpp

@@ -0,0 +1,112 @@
+#include <iostream>
+#include <cstring>
+#include <chrono>
+#include <glm/mat4x4.hpp>
+#include <glm/gtx/transform.hpp>
+#include "VK_UniformBuffer.h"
+#include "VK_Context.h"
+#include "VK_Image.h"
+#include "VK_Texture.h"
+
+using namespace std;
+
+VK_Context *context = nullptr;
+
+uint32_t updateUniformBufferData(char *&data, uint32_t size)
+{
+    static auto startTime = std::chrono::high_resolution_clock::now();
+    auto currentTime = std::chrono::high_resolution_clock::now();
+    float time = std::chrono::duration<float, std::chrono::seconds::period>(currentTime - startTime).count();
+    glm::mat4 model = glm::rotate(glm::mat4(1.0f), glm::radians(90.0f), glm::vec3(1.0f, 0.0f, 0.0f));
+    model *= glm::rotate(glm::mat4(1.0f), time * glm::radians(30.0f), glm::vec3(0.0f, 1.0f, 0.0f));
+    auto view = glm::lookAt(glm::vec3(0.0f, 4.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 1.0f));
+    auto proj = glm::perspective(glm::radians(45.0f),
+                                 context->getSwapChainExtent().width / (float)context->getSwapChainExtent().height, 0.1f, 10.0f);
+    proj[1][1] *= -1;
+
+    model = proj * view * model;
+    memcpy(data, &model[0][0], size);
+    time = sin(time);
+    memcpy(data + sizeof(float) * 16, (void *)&time, sizeof(float));
+    return 17 * sizeof(float);
+}
+
+void onFrameSizeChanged(int width, int height)
+{
+    auto vp = VK_Viewports::createViewport(width, height);
+    VK_Viewports vps;
+    vps.addViewport(vp);
+    context->setViewports(vps);
+}
+
+int main()
+{
+    VK_ContextConfig config;
+    config.debug = false;
+    config.name = "Model";
+
+    context = createVkContext(config);
+    context->createWindow(480, 480, true);
+    context->setOnFrameSizeChanged(onFrameSizeChanged);
+
+    VK_Context::VK_Config vkConfig;
+    context->initVulkanDevice(vkConfig);
+
+    auto shaderSet = context->createShaderSet();
+    shaderSet->addShader("../shader/model/vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+    shaderSet->addShader("../shader/model/frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+
+    shaderSet->appendAttributeDescription(0, sizeof (float) * 3);
+    shaderSet->appendAttributeDescription(1, sizeof (float) * 2);
+    shaderSet->appendAttributeDescription(2, sizeof (float) * 3);
+
+    VkDescriptorSetLayoutBinding uniformBinding = VK_ShaderSet::createDescriptorSetLayoutBinding(0,
+            VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT);
+    shaderSet->addDescriptorSetLayoutBinding(uniformBinding);
+
+    auto samplerBinding = VK_ShaderSet::createDescriptorSetLayoutBinding(1,
+                          VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT);
+    shaderSet->addDescriptorSetLayoutBinding(uniformBinding);
+    auto samplerCreateInfo  = VK_Sampler::createSamplerCreateInfo();
+    auto samplerPtr = context->createSampler(samplerCreateInfo);
+    VkSampler sampler = samplerPtr->getSampler();
+    samplerBinding.pImmutableSamplers = &sampler;
+
+    shaderSet->addDescriptorSetLayoutBinding(samplerBinding);
+
+    if (!shaderSet->isValid()) {
+        std::cerr << "invalid shaderSet" << std::endl;
+        shaderSet->release();
+        context->release();
+        return -1;
+    }
+
+    auto ubo = context->createUniformBuffer(0, sizeof(float) * 17);
+    ubo->setWriteDataCallback(updateUniformBufferData);
+    context->addUniformBuffer(ubo);
+
+    auto buffer = context->createVertexBuffer("../model/pug.obj", true);
+    context->addBuffer(buffer);
+
+    auto image = context->createImage("../model/PUG_TAN.tga");
+
+    auto imageViewCreateInfo = VK_ImageView::createImageViewCreateInfo(image->getImage(),
+                               VK_FORMAT_R8G8B8A8_SRGB);
+    auto imageView = context->createImageView(imageViewCreateInfo);
+    context->addImageView(imageView);
+
+    context->initVulkanContext(shaderSet);
+
+    auto rasterCreateInfo = context->getPipelineRasterizationStateCreateInfo();
+    rasterCreateInfo.cullMode = VK_CULL_MODE_NONE;
+    context->setPipelineRasterizationStateCreateInfo(rasterCreateInfo);
+
+    context->initPipeline();
+    context->createCommandBuffers();
+
+    context->run();
+    context->release();
+
+    return 0;
+}
+

model/PUG_TAN.png

@@ -0,0 +1,11 @@
+#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 = texture(texSampler, fragTexCoord);
+}

screenshots/model.png

@@ -2,21 +2,16 @@
 layout(location = 0) in vec3 inPosition;
 layout(location = 1) in vec2 coord;
 layout(location = 2) in vec3 inColor;
-layout(location = 0) out vec4 fragColor;
 layout(binding = 0) uniform UniformBufferObject {
     mat4 model;
     float value;
 } mvp;
 
+layout(location = 0) out vec3 fragColor;
+layout(location = 1) out vec2 fragTexCoord;
+
 void main() {
     gl_Position = mvp.model*vec4(inPosition, 1.0);
-
-    if(inPosition.y > mvp.value)
-    {
-        fragColor = vec4(1.0,0.3,0.3,1.0);
-    }
-    else
-    {
-        fragColor = vec4(0.3,0.3,1.0,1.0);
-    }
+    fragColor = inColor;
+    fragTexCoord = coord;
 }