Fixed typos
This commit is contained in:
parent
2898671f40
commit
583e61ac35
9 changed files with 10 additions and 10 deletions
|
|
@ -128,7 +128,7 @@ namespace vks
|
||||||
/**
|
/**
|
||||||
* Add a new attachment described by createinfo to the framebuffer's attachment list
|
* Add a new attachment described by createinfo to the framebuffer's attachment list
|
||||||
*
|
*
|
||||||
* @param createinfo Structure that specifices the framebuffer to be constructed
|
* @param createinfo Structure that specifies the framebuffer to be constructed
|
||||||
*
|
*
|
||||||
* @return Index of the new attachment
|
* @return Index of the new attachment
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@ namespace vks
|
||||||
VkPipelineStageFlags srcStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
VkPipelineStageFlags srcStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
||||||
VkPipelineStageFlags dstStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
|
VkPipelineStageFlags dstStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
|
||||||
|
|
||||||
/** @brief Inser an image memory barrier into the command buffer */
|
/** @brief Insert an image memory barrier into the command buffer */
|
||||||
void insertImageMemoryBarrier(
|
void insertImageMemoryBarrier(
|
||||||
VkCommandBuffer cmdbuffer,
|
VkCommandBuffer cmdbuffer,
|
||||||
VkImage image,
|
VkImage image,
|
||||||
|
|
|
||||||
|
|
@ -353,7 +353,7 @@ public:
|
||||||
// Second pass: Deferred calculations
|
// Second pass: Deferred calculations
|
||||||
// -------------------------------------------------------------------------------------------------------
|
// -------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
// Clear values for all attachments written in the fragment sahder
|
// Clear values for all attachments written in the fragment shader
|
||||||
clearValues[0].color = { { 0.0f, 0.0f, 0.0f, 0.0f } };
|
clearValues[0].color = { { 0.0f, 0.0f, 0.0f, 0.0f } };
|
||||||
clearValues[1].color = { { 0.0f, 0.0f, 0.0f, 0.0f } };
|
clearValues[1].color = { { 0.0f, 0.0f, 0.0f, 0.0f } };
|
||||||
clearValues[2].color = { { 0.0f, 0.0f, 0.0f, 0.0f } };
|
clearValues[2].color = { { 0.0f, 0.0f, 0.0f, 0.0f } };
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,7 @@ public:
|
||||||
|
|
||||||
Using the shared descriptor set layout and the descriptor pool we will now allocate the descriptor sets.
|
Using the shared descriptor set layout and the descriptor pool we will now allocate the descriptor sets.
|
||||||
|
|
||||||
Descriptor sets contain the actual descriptor fo the objects (buffers, images) used at render time.
|
Descriptor sets contain the actual descriptor for the objects (buffers, images) used at render time.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -203,7 +203,7 @@ public:
|
||||||
|
|
||||||
std::vector<VkWriteDescriptorSet> writeDescriptorSets =
|
std::vector<VkWriteDescriptorSet> writeDescriptorSets =
|
||||||
{
|
{
|
||||||
// Binding 0 : Vertex shader shader ubo
|
// Binding 0 : Vertex shader ubo
|
||||||
vks::initializers::writeDescriptorSet(
|
vks::initializers::writeDescriptorSet(
|
||||||
descriptorSet,
|
descriptorSet,
|
||||||
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
// Contains the texture for a single glTF image
|
// Contains the texture for a single glTF image
|
||||||
// Images may be reused by texture objects and are as such separted
|
// Images may be reused by texture objects and are as such separated
|
||||||
struct Image {
|
struct Image {
|
||||||
vks::Texture2D texture;
|
vks::Texture2D texture;
|
||||||
// We also store (and create) a descriptor set that's used to access this texture from the fragment shader
|
// We also store (and create) a descriptor set that's used to access this texture from the fragment shader
|
||||||
|
|
|
||||||
|
|
@ -241,7 +241,7 @@ void VulkanglTFScene::drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout p
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (node.mesh.primitives.size() > 0) {
|
if (node.mesh.primitives.size() > 0) {
|
||||||
// Pass the node's matrix via push constanst
|
// Pass the node's matrix via push constants
|
||||||
// Traverse the node hierarchy to the top-most parent to get the final matrix of the current node
|
// Traverse the node hierarchy to the top-most parent to get the final matrix of the current node
|
||||||
glm::mat4 nodeMatrix = node.matrix;
|
glm::mat4 nodeMatrix = node.matrix;
|
||||||
VulkanglTFScene::Node* currentParent = node.parent;
|
VulkanglTFScene::Node* currentParent = node.parent;
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
// Contains the texture for a single glTF image
|
// Contains the texture for a single glTF image
|
||||||
// Images may be reused by texture objects and are as such separted
|
// Images may be reused by texture objects and are as such separated
|
||||||
struct Image {
|
struct Image {
|
||||||
vks::Texture2D texture;
|
vks::Texture2D texture;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,7 @@ public:
|
||||||
vkCmdBindIndexBuffer(drawCmdBuffers[i], models.plants.indices.buffer, 0, VK_INDEX_TYPE_UINT32);
|
vkCmdBindIndexBuffer(drawCmdBuffers[i], models.plants.indices.buffer, 0, VK_INDEX_TYPE_UINT32);
|
||||||
|
|
||||||
// If the multi draw feature is supported:
|
// If the multi draw feature is supported:
|
||||||
// One draw call for an arbitrary number of ojects
|
// One draw call for an arbitrary number of objects
|
||||||
// Index offsets and instance count are taken from the indirect buffer
|
// Index offsets and instance count are taken from the indirect buffer
|
||||||
if (vulkanDevice->features.multiDrawIndirect)
|
if (vulkanDevice->features.multiDrawIndirect)
|
||||||
{
|
{
|
||||||
|
|
@ -302,7 +302,7 @@ public:
|
||||||
// ...
|
// ...
|
||||||
// layout (location = 4) in vec3 instancePos; Per-Instance
|
// layout (location = 4) in vec3 instancePos; Per-Instance
|
||||||
attributeDescriptions = {
|
attributeDescriptions = {
|
||||||
// Per-vertex attributees
|
// Per-vertex attributes
|
||||||
// These are advanced for each vertex fetched by the vertex shader
|
// These are advanced for each vertex fetched by the vertex shader
|
||||||
vks::initializers::vertexInputAttributeDescription(VERTEX_BUFFER_BIND_ID, 0, VK_FORMAT_R32G32B32_SFLOAT, 0), // Location 0: Position
|
vks::initializers::vertexInputAttributeDescription(VERTEX_BUFFER_BIND_ID, 0, VK_FORMAT_R32G32B32_SFLOAT, 0), // Location 0: Position
|
||||||
vks::initializers::vertexInputAttributeDescription(VERTEX_BUFFER_BIND_ID, 1, VK_FORMAT_R32G32B32_SFLOAT, sizeof(float) * 3), // Location 1: Normal
|
vks::initializers::vertexInputAttributeDescription(VERTEX_BUFFER_BIND_ID, 1, VK_FORMAT_R32G32B32_SFLOAT, sizeof(float) * 3), // Location 1: Normal
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue