Fixed typos

This commit is contained in:
Sascha Willems 2020-08-08 18:22:10 +02:00
parent 5539991ca5
commit 78f9881ebf
18 changed files with 28 additions and 28 deletions

View file

@ -278,7 +278,7 @@ public:
bufferBarrier.size = compute.storageBuffer.descriptor.range; bufferBarrier.size = compute.storageBuffer.descriptor.range;
bufferBarrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT; bufferBarrier.srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT;
bufferBarrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT; bufferBarrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
// Transfer ownership if compute and graphics queue familiy indices differ // Transfer ownership if compute and graphics queue family indices differ
bufferBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; bufferBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
bufferBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; bufferBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;

View file

@ -86,7 +86,7 @@ public:
struct Particle { struct Particle {
glm::vec2 pos; // Particle position glm::vec2 pos; // Particle position
glm::vec2 vel; // Particle velocity glm::vec2 vel; // Particle velocity
glm::vec4 gradientPos; // Texture coordiantes for the gradient ramp map glm::vec4 gradientPos; // Texture coordinates for the gradient ramp map
}; };
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION) VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)

View file

@ -8,7 +8,7 @@
/* /*
* Note: This sample is deprecated! * Note: This sample is deprecated!
* An updated version using VK_EXT_debug_utils along with an in-depth tutorial is available in the pfficial Khronos Vulkan Samples repository at * An updated version using VK_EXT_debug_utils along with an in-depth tutorial is available in the official Khronos Vulkan Samples repository at
* https://github.com/KhronosGroup/Vulkan-Samples/blob/master/samples/extensions/debug_utils. * https://github.com/KhronosGroup/Vulkan-Samples/blob/master/samples/extensions/debug_utils.
*/ */
@ -145,7 +145,7 @@ namespace DebugMarker
// End the current debug marker region // End the current debug marker region
void endRegion(VkCommandBuffer cmdBuffer) void endRegion(VkCommandBuffer cmdBuffer)
{ {
// Check for valid function (may not be present if not runnin in a debugging application) // Check for valid function (may not be present if not running in a debugging application)
if (vkCmdDebugMarkerEnd) if (vkCmdDebugMarkerEnd)
{ {
vkCmdDebugMarkerEnd(cmdBuffer); vkCmdDebugMarkerEnd(cmdBuffer);
@ -707,7 +707,7 @@ public:
blendAttachmentState.dstAlphaBlendFactor = VK_BLEND_FACTOR_DST_ALPHA; blendAttachmentState.dstAlphaBlendFactor = VK_BLEND_FACTOR_DST_ALPHA;
VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.postprocess)); VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCI, nullptr, &pipelines.postprocess));
// Name shader moduels for debugging // Name shader modules for debugging
// Shader module count starts at 2 when UI overlay in base class is enabled // Shader module count starts at 2 when UI overlay in base class is enabled
uint32_t moduleIndex = settings.overlay ? 2 : 0; uint32_t moduleIndex = settings.overlay ? 2 : 0;
DebugMarker::setObjectName(device, (uint64_t)shaderModules[moduleIndex + 0], VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT, "Toon shading vertex shader"); DebugMarker::setObjectName(device, (uint64_t)shaderModules[moduleIndex + 0], VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT, "Toon shading vertex shader");

View file

@ -328,7 +328,7 @@ public:
subpass.colorAttachmentCount = static_cast<uint32_t>(colorReferences.size()); subpass.colorAttachmentCount = static_cast<uint32_t>(colorReferences.size());
subpass.pDepthStencilAttachment = &depthReference; subpass.pDepthStencilAttachment = &depthReference;
// Use subpass dependencies for attachment layput transitions // Use subpass dependencies for attachment layout transitions
std::array<VkSubpassDependency, 2> dependencies; std::array<VkSubpassDependency, 2> dependencies;
dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL; dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL;
@ -405,7 +405,7 @@ public:
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo(); VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
// Clear values for all attachments written in the fragment sahder // Clear values for all attachments written in the fragment shader
std::array<VkClearValue,4> clearValues; std::array<VkClearValue,4> clearValues;
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 } };
@ -784,7 +784,7 @@ public:
// Wait for offscreen semaphore // Wait for offscreen semaphore
submitInfo.pWaitSemaphores = &offscreenSemaphore; submitInfo.pWaitSemaphores = &offscreenSemaphore;
// Signal ready with render complete semaphpre // Signal ready with render complete semaphore
submitInfo.pSignalSemaphores = &semaphores.renderComplete; submitInfo.pSignalSemaphores = &semaphores.renderComplete;
// Submit work // Submit work

View file

@ -225,7 +225,7 @@ public:
VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo(); VkCommandBufferBeginInfo cmdBufInfo = vks::initializers::commandBufferBeginInfo();
// Clear values for all attachments written in the fragment sahder // Clear values for all attachments written in the fragment shader
std::array<VkClearValue,4> clearValues; std::array<VkClearValue,4> clearValues;
clearValues[0].color = clearValues[1].color = { { 0.0f, 0.0f, 0.0f, 0.0f } }; clearValues[0].color = 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 } };
@ -625,7 +625,7 @@ public:
// Wait for offscreen semaphore // Wait for offscreen semaphore
submitInfo.pWaitSemaphores = &offscreenSemaphore; submitInfo.pWaitSemaphores = &offscreenSemaphore;
// Signal ready with render complete semaphpre // Signal ready with render complete semaphore
submitInfo.pSignalSemaphores = &semaphores.renderComplete; submitInfo.pSignalSemaphores = &semaphores.renderComplete;
// Submit work // Submit work

View file

@ -782,7 +782,7 @@ public:
// Wait for offscreen semaphore // Wait for offscreen semaphore
submitInfo.pWaitSemaphores = &offscreenSemaphore; submitInfo.pWaitSemaphores = &offscreenSemaphore;
// Signal ready with render complete semaphpre // Signal ready with render complete semaphore
submitInfo.pSignalSemaphores = &semaphores.renderComplete; submitInfo.pSignalSemaphores = &semaphores.renderComplete;
// Submit work // Submit work

View file

@ -164,7 +164,7 @@ public:
std::array<VkDescriptorSetLayoutBinding,2> setLayoutBindings{}; std::array<VkDescriptorSetLayoutBinding,2> setLayoutBindings{};
/* /*
Binding 0: Uniform buffers (used to pass matrices matrices) Binding 0: Uniform buffers (used to pass matrices)
*/ */
setLayoutBindings[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; setLayoutBindings[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
// Shader binding point // Shader binding point

View file

@ -320,7 +320,7 @@ public:
v.pos[1] -= 0.5f; v.pos[1] -= 0.5f;
} }
// Generate host accesible buffers for the text vertices and indices and upload the data // Generate host accessible buffers for the text vertices and indices and upload the data
VK_CHECK_RESULT(vulkanDevice->createBuffer( VK_CHECK_RESULT(vulkanDevice->createBuffer(
VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
@ -593,7 +593,7 @@ public:
&uniformBuffers.vs, &uniformBuffers.vs,
sizeof(uboVS))); sizeof(uboVS)));
// Fragment sahder uniform buffer block (Contains font rendering parameters) // Fragment shader uniform buffer block (Contains font rendering parameters)
VK_CHECK_RESULT(vulkanDevice->createBuffer( VK_CHECK_RESULT(vulkanDevice->createBuffer(
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,

View file

@ -36,7 +36,7 @@ layout (binding = 1) uniform UboInstance {
***Note:*** When preparing the (host) memory to back up the dynamic uniform buffer object it's crucial to take the [minUniformBufferOffsetAlignment](http://vulkan.gpuinfo.org/listreports.php?limit=minUniformBufferOffsetAlignment) limit of the implementation into account. ***Note:*** When preparing the (host) memory to back up the dynamic uniform buffer object it's crucial to take the [minUniformBufferOffsetAlignment](http://vulkan.gpuinfo.org/listreports.php?limit=minUniformBufferOffsetAlignment) limit of the implementation into account.
Due to the implementation dependant alignment (different from our actual data size) we can't just use a vector and work with pointers instead: Due to the implementation dependent alignment (different from our actual data size) we can't just use a vector and work with pointers instead:
```cpp ```cpp
struct UboDataDynamic { struct UboDataDynamic {

View file

@ -346,7 +346,7 @@ public:
void drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout, VulkanglTFModel::Node node) void drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout pipelineLayout, VulkanglTFModel::Node node)
{ {
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;
VulkanglTFModel::Node* currentParent = node.parent; VulkanglTFModel::Node* currentParent = node.parent;

View file

@ -49,7 +49,7 @@ void VulkanglTFScene::loadImages(tinygltf::Model& input)
### Materials ### Materials
#### New Material poperties #### New Material properties
```cpp ```cpp
struct Material struct Material

View file

@ -589,7 +589,7 @@ void VulkanglTFModel::drawNode(VkCommandBuffer commandBuffer, VkPipelineLayout p
{ {
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;
VulkanglTFModel::Node *currentParent = node.parent; VulkanglTFModel::Node *currentParent = node.parent;

View file

@ -385,7 +385,7 @@ public:
// Depth attachment // Depth attachment
createAttachment(depthFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, &offscreen.depth); createAttachment(depthFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, &offscreen.depth);
// Set up separate renderpass with references to the colorand depth attachments // Set up separate renderpass with references to the color and depth attachments
std::array<VkAttachmentDescription, 3> attachmentDescs = {}; std::array<VkAttachmentDescription, 3> attachmentDescs = {};
// Init attachment properties // Init attachment properties
@ -427,7 +427,7 @@ public:
subpass.colorAttachmentCount = 2; subpass.colorAttachmentCount = 2;
subpass.pDepthStencilAttachment = &depthReference; subpass.pDepthStencilAttachment = &depthReference;
// Use subpass dependencies for attachment layput transitions // Use subpass dependencies for attachment layout transitions
std::array<VkSubpassDependency, 2> dependencies; std::array<VkSubpassDependency, 2> dependencies;
dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL; dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL;
@ -499,7 +499,7 @@ public:
// Two floating point color buffers // Two floating point color buffers
createAttachment(VK_FORMAT_R32G32B32A32_SFLOAT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, &filterPass.color[0]); createAttachment(VK_FORMAT_R32G32B32A32_SFLOAT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, &filterPass.color[0]);
// Set up separate renderpass with references to the colorand depth attachments // Set up separate renderpass with references to the color and depth attachments
std::array<VkAttachmentDescription, 1> attachmentDescs = {}; std::array<VkAttachmentDescription, 1> attachmentDescs = {};
// Init attachment properties // Init attachment properties
@ -520,7 +520,7 @@ public:
subpass.pColorAttachments = colorReferences.data(); subpass.pColorAttachments = colorReferences.data();
subpass.colorAttachmentCount = 1; subpass.colorAttachmentCount = 1;
// Use subpass dependencies for attachment layput transitions // Use subpass dependencies for attachment layout transitions
std::array<VkSubpassDependency, 2> dependencies; std::array<VkSubpassDependency, 2> dependencies;
dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL; dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL;

View file

@ -308,7 +308,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

View file

@ -118,7 +118,7 @@ public:
camera.setRotationSpeed(0.5f); camera.setRotationSpeed(0.5f);
camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f); camera.setPerspective(60.0f, (float)width / (float)height, 0.1f, 256.0f);
settings.overlay = true; settings.overlay = true;
// Get number of max. concurrrent threads // Get number of max. concurrent threads
numThreads = std::thread::hardware_concurrency(); numThreads = std::thread::hardware_concurrency();
assert(numThreads > 0); assert(numThreads > 0);
#if defined(__ANDROID__) #if defined(__ANDROID__)

View file

@ -110,7 +110,7 @@ public:
"Input assembly primitives count ", "Input assembly primitives count ",
"Vertex shader invocations ", "Vertex shader invocations ",
"Clipping stage primitives processed", "Clipping stage primitives processed",
"Clipping stage primtives output ", "Clipping stage primitives output ",
"Fragment shader invocations " "Fragment shader invocations "
}; };
if (deviceFeatures.tessellationShader) { if (deviceFeatures.tessellationShader) {

View file

@ -61,7 +61,7 @@ public:
glm::mat4 projection; glm::mat4 projection;
glm::mat4 view; glm::mat4 view;
} matrices; } matrices;
// Seperate data for each instance // Separate data for each instance
UboInstanceData *instance; UboInstanceData *instance;
} uboVS; } uboVS;

View file

@ -187,7 +187,7 @@ void VulkanExample::prepareSparseTexture(uint32_t width, uint32_t height, uint32
texture.layerCount = layerCount; texture.layerCount = layerCount;
texture.format = format; texture.format = format;
// Get device properites for the requested texture format // Get device properties for the requested texture format
VkFormatProperties formatProperties; VkFormatProperties formatProperties;
vkGetPhysicalDeviceFormatProperties(physicalDevice, format, &formatProperties); vkGetPhysicalDeviceFormatProperties(physicalDevice, format, &formatProperties);
@ -251,7 +251,7 @@ void VulkanExample::prepareSparseTexture(uint32_t width, uint32_t height, uint32
// Check requested image size against hardware sparse limit // Check requested image size against hardware sparse limit
if (sparseImageMemoryReqs.size > vulkanDevice->properties.limits.sparseAddressSpaceSize) if (sparseImageMemoryReqs.size > vulkanDevice->properties.limits.sparseAddressSpaceSize)
{ {
std::cout << "Error: Requested sparse image size exceeds supportes sparse address space size!" << std::endl; std::cout << "Error: Requested sparse image size exceeds supports sparse address space size!" << std::endl;
return; return;
}; };