commit for revert
parent
bdd9405f88
commit
d589afb3bb
|
@ -660,7 +660,7 @@ void VulkanExample::getEnabledFeatures()
|
|||
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
|
||||
|
||||
VkClearValue clearValues[2];
|
||||
|
||||
clearValues[0].color = defaultClearColor;
|
||||
clearValues[0].color = { { 0.25f, 0.25f, 0.25f, 1.0f } };;
|
||||
clearValues[1].depthStencil = { 1.0f, 0 };
|
||||
|
||||
|
@ -837,13 +837,16 @@ void VulkanExample::getEnabledFeatures()
|
|||
VkDescriptorPoolCreateInfo descriptorPoolInfo = vks::initializers::descriptorPoolCreateInfo(poolSizes, maxSetCount);
|
||||
VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool));
|
||||
|
||||
// Descriptor set layouts
|
||||
std::vector<VkDescriptorSetLayoutBinding> setLayoutBindings =
|
||||
{
|
||||
vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, 0),
|
||||
vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, 0),
|
||||
vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, 0),
|
||||
};
|
||||
|
||||
VkDescriptorSetLayoutCreateInfo descriptorSetLayoutCI = vks::initializers::descriptorSetLayoutCreateInfo(setLayoutBinding);
|
||||
|
||||
// Descriptor set layout for passing matrices
|
||||
|
||||
setLayoutBinding = vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, 0);
|
||||
VkDescriptorSetLayoutCreateInfo descriptorSetLayoutCI = vks::initializers::descriptorSetLayoutCreateInfo(setLayoutBindings);
|
||||
VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorSetLayoutCI, nullptr, &descriptorSetLayouts.matrices));
|
||||
|
||||
// Descriptor set layout for passing material textures
|
||||
|
@ -853,7 +856,7 @@ void VulkanExample::getEnabledFeatures()
|
|||
|
||||
|
||||
// Descriptor set layout for passing skin joint matrices
|
||||
setLayoutBinding = vks::initializers::descriptorSetLayoutBinding(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, 0);
|
||||
|
||||
VK_CHECK_RESULT(vkCreateDescriptorSetLayout(device, &descriptorSetLayoutCI, nullptr, &descriptorSetLayouts.jointMatrices));
|
||||
|
||||
// The pipeline layout uses three sets:
|
||||
|
@ -1000,7 +1003,7 @@ void VulkanExample::getEnabledFeatures()
|
|||
}
|
||||
if (!paused)
|
||||
{
|
||||
glTFModel.updateAnimation(frameTimer,shaderData.skinSSBO);
|
||||
glTFModel.updateAnimation(frameTimer,shaderData.buffer);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -223,12 +223,14 @@ public:
|
|||
VkDescriptorSetLayout matrices;
|
||||
VkDescriptorSetLayout textures;
|
||||
VkDescriptorSetLayout jointMatrices;
|
||||
VkDescriptorSetLayout ssbo;
|
||||
} descriptorSetLayouts;
|
||||
|
||||
VkDescriptorSet descriptorSet;
|
||||
|
||||
VulkanExample();
|
||||
~VulkanExample();
|
||||
|
||||
void loadglTFFile(std::string filename);
|
||||
virtual void getEnabledFeatures();
|
||||
void buildCommandBuffers();
|
||||
|
|
Loading…
Reference in New Issue