Replaced vkTools::UniformData with newer vk::Buffer for uniform buffers, some renaming, small fixes and corrections
This commit is contained in:
saschawillems
parent
d73afe2a7d
commit
2e5af6a9fb
32 changed files with 717 additions and 985 deletions
|
|
@ -22,6 +22,7 @@
|
|||
#include <vulkan/vulkan.h>
|
||||
#include "vulkanexamplebase.h"
|
||||
#include "vulkanframebuffer.hpp"
|
||||
#include "vulkanbuffer.hpp"
|
||||
|
||||
#define VERTEX_BUFFER_BIND_ID 0
|
||||
#define ENABLE_VALIDATION false
|
||||
|
|
@ -125,11 +126,11 @@ public:
|
|||
} uboFragmentLights;
|
||||
|
||||
struct {
|
||||
vkTools::UniformData vsFullScreen;
|
||||
vkTools::UniformData vsOffscreen;
|
||||
vkTools::UniformData fsLights;
|
||||
vkTools::UniformData uboShadowGS;
|
||||
} uniformData;
|
||||
vk::Buffer vsFullScreen;
|
||||
vk::Buffer vsOffscreen;
|
||||
vk::Buffer fsLights;
|
||||
vk::Buffer uboShadowGS;
|
||||
} uniformBuffers;
|
||||
|
||||
struct {
|
||||
VkPipeline deferred;
|
||||
|
|
@ -225,10 +226,10 @@ public:
|
|||
vkMeshLoader::freeMeshBufferResources(device, &meshes.quad);
|
||||
|
||||
// Uniform buffers
|
||||
vkTools::destroyUniformData(device, &uniformData.vsOffscreen);
|
||||
vkTools::destroyUniformData(device, &uniformData.vsFullScreen);
|
||||
vkTools::destroyUniformData(device, &uniformData.fsLights);
|
||||
vkTools::destroyUniformData(device, &uniformData.uboShadowGS);
|
||||
uniformBuffers.vsOffscreen.destroy();
|
||||
uniformBuffers.vsFullScreen.destroy();
|
||||
uniformBuffers.fsLights.destroy();
|
||||
uniformBuffers.uboShadowGS.destroy();
|
||||
|
||||
vkFreeCommandBuffers(device, cmdPool, 1, &commandBuffers.deferred);
|
||||
|
||||
|
|
@ -695,7 +696,7 @@ public:
|
|||
descriptorSet,
|
||||
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||
0,
|
||||
&uniformData.vsFullScreen.descriptor),
|
||||
&uniformBuffers.vsFullScreen.descriptor),
|
||||
// Binding 1: World space position texture
|
||||
vkTools::initializers::writeDescriptorSet(
|
||||
descriptorSet,
|
||||
|
|
@ -719,7 +720,7 @@ public:
|
|||
descriptorSet,
|
||||
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||
4,
|
||||
&uniformData.fsLights.descriptor),
|
||||
&uniformBuffers.fsLights.descriptor),
|
||||
// Binding 5: Shadow map
|
||||
vkTools::initializers::writeDescriptorSet(
|
||||
descriptorSet,
|
||||
|
|
@ -741,7 +742,7 @@ public:
|
|||
descriptorSets.model,
|
||||
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||
0,
|
||||
&uniformData.vsOffscreen.descriptor),
|
||||
&uniformBuffers.vsOffscreen.descriptor),
|
||||
// Binding 1: Color map
|
||||
vkTools::initializers::writeDescriptorSet(
|
||||
descriptorSets.model,
|
||||
|
|
@ -766,7 +767,7 @@ public:
|
|||
descriptorSets.background,
|
||||
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||
0,
|
||||
&uniformData.vsOffscreen.descriptor),
|
||||
&uniformBuffers.vsOffscreen.descriptor),
|
||||
// Binding 1: Color map
|
||||
vkTools::initializers::writeDescriptorSet(
|
||||
descriptorSets.background,
|
||||
|
|
@ -791,7 +792,7 @@ public:
|
|||
descriptorSets.shadow,
|
||||
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||
0,
|
||||
&uniformData.uboShadowGS.descriptor),
|
||||
&uniformBuffers.uboShadowGS.descriptor),
|
||||
};
|
||||
vkUpdateDescriptorSets(device, static_cast<uint32_t>(writeDescriptorSets.size()), writeDescriptorSets.data(), 0, NULL);
|
||||
}
|
||||
|
|
@ -935,44 +936,38 @@ public:
|
|||
void prepareUniformBuffers()
|
||||
{
|
||||
// Fullscreen vertex shader
|
||||
createBuffer(
|
||||
VK_CHECK_RESULT(vulkanDevice->createBuffer(
|
||||
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
|
||||
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||
sizeof(uboVS),
|
||||
nullptr,
|
||||
&uniformData.vsFullScreen.buffer,
|
||||
&uniformData.vsFullScreen.memory,
|
||||
&uniformData.vsFullScreen.descriptor);
|
||||
&uniformBuffers.vsFullScreen,
|
||||
sizeof(uboVS)));
|
||||
|
||||
// Deferred vertex shader
|
||||
createBuffer(
|
||||
VK_CHECK_RESULT(vulkanDevice->createBuffer(
|
||||
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
|
||||
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||
sizeof(uboOffscreenVS),
|
||||
nullptr,
|
||||
&uniformData.vsOffscreen.buffer,
|
||||
&uniformData.vsOffscreen.memory,
|
||||
&uniformData.vsOffscreen.descriptor);
|
||||
&uniformBuffers.vsOffscreen,
|
||||
sizeof(uboOffscreenVS)));
|
||||
|
||||
// Deferred fragment shader
|
||||
createBuffer(
|
||||
VK_CHECK_RESULT(vulkanDevice->createBuffer(
|
||||
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
|
||||
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||
sizeof(uboFragmentLights),
|
||||
nullptr,
|
||||
&uniformData.fsLights.buffer,
|
||||
&uniformData.fsLights.memory,
|
||||
&uniformData.fsLights.descriptor);
|
||||
&uniformBuffers.fsLights,
|
||||
sizeof(uboFragmentLights)));
|
||||
|
||||
// Shadow map vertex shader (matrices from shadow's pov)
|
||||
createBuffer(
|
||||
VK_CHECK_RESULT(vulkanDevice->createBuffer(
|
||||
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
|
||||
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
|
||||
sizeof(uboShadowGS),
|
||||
nullptr,
|
||||
&uniformData.uboShadowGS.buffer,
|
||||
&uniformData.uboShadowGS.memory,
|
||||
&uniformData.uboShadowGS.descriptor);
|
||||
&uniformBuffers.uboShadowGS,
|
||||
sizeof(uboShadowGS)));
|
||||
|
||||
// Map persistent
|
||||
VK_CHECK_RESULT(uniformBuffers.vsFullScreen.map());
|
||||
VK_CHECK_RESULT(uniformBuffers.vsOffscreen.map());
|
||||
VK_CHECK_RESULT(uniformBuffers.fsLights.map());
|
||||
VK_CHECK_RESULT(uniformBuffers.uboShadowGS.map());
|
||||
|
||||
// Init some values
|
||||
uboOffscreenVS.instancePos[0] = glm::vec4(0.0f);
|
||||
|
|
@ -982,7 +977,6 @@ public:
|
|||
uboOffscreenVS.instancePos[1] = glm::vec4(-7.0f, 0.0, -4.0f, 0.0f);
|
||||
uboOffscreenVS.instancePos[2] = glm::vec4(4.0f, 0.0, -6.0f, 0.0f);
|
||||
|
||||
|
||||
// Update
|
||||
updateUniformBuffersScreen();
|
||||
updateUniformBufferDeferredMatrices();
|
||||
|
|
@ -993,11 +987,7 @@ public:
|
|||
{
|
||||
uboVS.projection = glm::ortho(0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f);
|
||||
uboVS.model = glm::mat4();
|
||||
|
||||
uint8_t *pData;
|
||||
VK_CHECK_RESULT(vkMapMemory(device, uniformData.vsFullScreen.memory, 0, sizeof(uboVS), 0, (void **)&pData));
|
||||
memcpy(pData, &uboVS, sizeof(uboVS));
|
||||
vkUnmapMemory(device, uniformData.vsFullScreen.memory);
|
||||
memcpy(uniformBuffers.vsFullScreen.mapped, &uboVS, sizeof(uboVS));
|
||||
}
|
||||
|
||||
void updateUniformBufferDeferredMatrices()
|
||||
|
|
@ -1005,11 +995,7 @@ public:
|
|||
uboOffscreenVS.projection = camera.matrices.perspective;
|
||||
uboOffscreenVS.view = camera.matrices.view;
|
||||
uboOffscreenVS.model = glm::mat4();
|
||||
|
||||
uint8_t *pData;
|
||||
VK_CHECK_RESULT(vkMapMemory(device, uniformData.vsOffscreen.memory, 0, sizeof(uboOffscreenVS), 0, (void **)&pData));
|
||||
memcpy(pData, &uboOffscreenVS, sizeof(uboOffscreenVS));
|
||||
vkUnmapMemory(device, uniformData.vsOffscreen.memory);
|
||||
memcpy(uniformBuffers.vsOffscreen.mapped, &uboOffscreenVS, sizeof(uboOffscreenVS));
|
||||
}
|
||||
|
||||
Light initLight(glm::vec3 pos, glm::vec3 target, glm::vec3 color)
|
||||
|
|
@ -1059,15 +1045,11 @@ public:
|
|||
|
||||
memcpy(uboShadowGS.instancePos, uboOffscreenVS.instancePos, sizeof(uboOffscreenVS.instancePos));
|
||||
|
||||
VK_CHECK_RESULT(vkMapMemory(device, uniformData.uboShadowGS.memory, 0, sizeof(uboShadowGS), 0, (void **)&pData));
|
||||
memcpy(pData, &uboShadowGS, sizeof(uboShadowGS));
|
||||
vkUnmapMemory(device, uniformData.uboShadowGS.memory);
|
||||
memcpy(uniformBuffers.uboShadowGS.mapped, &uboShadowGS, sizeof(uboShadowGS));
|
||||
|
||||
uboFragmentLights.viewPos = glm::vec4(camera.position, 0.0f) * glm::vec4(-1.0f, 1.0f, -1.0f, 1.0f);;
|
||||
|
||||
VK_CHECK_RESULT(vkMapMemory(device, uniformData.fsLights.memory, 0, sizeof(uboFragmentLights), 0, (void **)&pData));
|
||||
memcpy(pData, &uboFragmentLights, sizeof(uboFragmentLights));
|
||||
vkUnmapMemory(device, uniformData.fsLights.memory);
|
||||
memcpy(uniformBuffers.fsLights.mapped, &uboFragmentLights, sizeof(uboFragmentLights));
|
||||
}
|
||||
|
||||
void draw()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue