Removed outdated todos
This commit is contained in:
parent
afde90dcfd
commit
213bf850d5
5 changed files with 1 additions and 6 deletions
|
|
@ -195,7 +195,6 @@ namespace vks
|
||||||
imageView.viewType = (createinfo.layerCount == 1) ? VK_IMAGE_VIEW_TYPE_2D : VK_IMAGE_VIEW_TYPE_2D_ARRAY;
|
imageView.viewType = (createinfo.layerCount == 1) ? VK_IMAGE_VIEW_TYPE_2D : VK_IMAGE_VIEW_TYPE_2D_ARRAY;
|
||||||
imageView.format = createinfo.format;
|
imageView.format = createinfo.format;
|
||||||
imageView.subresourceRange = attachment.subresourceRange;
|
imageView.subresourceRange = attachment.subresourceRange;
|
||||||
//todo: workaround for depth+stencil attachments
|
|
||||||
imageView.subresourceRange.aspectMask = (attachment.hasDepth()) ? VK_IMAGE_ASPECT_DEPTH_BIT : aspectMask;
|
imageView.subresourceRange.aspectMask = (attachment.hasDepth()) ? VK_IMAGE_ASPECT_DEPTH_BIT : aspectMask;
|
||||||
imageView.image = attachment.image;
|
imageView.image = attachment.image;
|
||||||
VK_CHECK_RESULT(vkCreateImageView(vulkanDevice->logicalDevice, &imageView, nullptr, &attachment.view));
|
VK_CHECK_RESULT(vkCreateImageView(vulkanDevice->logicalDevice, &imageView, nullptr, &attachment.view));
|
||||||
|
|
|
||||||
|
|
@ -349,8 +349,7 @@ public:
|
||||||
VkDrawIndexedIndirectCommand indirectCmd{};
|
VkDrawIndexedIndirectCommand indirectCmd{};
|
||||||
indirectCmd.instanceCount = OBJECT_INSTANCE_COUNT;
|
indirectCmd.instanceCount = OBJECT_INSTANCE_COUNT;
|
||||||
indirectCmd.firstInstance = m * OBJECT_INSTANCE_COUNT;
|
indirectCmd.firstInstance = m * OBJECT_INSTANCE_COUNT;
|
||||||
// @todo: Multiple primitives
|
// A glTF node may consist of multiple primitives, but for this saample we only care for the first primitive
|
||||||
// A glTF node may consist of multiple primitives, so we may have to do multiple commands per mesh
|
|
||||||
indirectCmd.firstIndex = node->mesh->primitives[0]->firstIndex;
|
indirectCmd.firstIndex = node->mesh->primitives[0]->firstIndex;
|
||||||
indirectCmd.indexCount = node->mesh->primitives[0]->indexCount;
|
indirectCmd.indexCount = node->mesh->primitives[0]->indexCount;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -201,7 +201,6 @@ public:
|
||||||
&primitive_count,
|
&primitive_count,
|
||||||
&accelerationStructureBuildSizesInfo);
|
&accelerationStructureBuildSizesInfo);
|
||||||
|
|
||||||
// @todo: as return value?
|
|
||||||
createAccelerationStructure(topLevelAS, VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR, accelerationStructureBuildSizesInfo);
|
createAccelerationStructure(topLevelAS, VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR, accelerationStructureBuildSizesInfo);
|
||||||
|
|
||||||
// Create a small scratch buffer used during build of the top level acceleration structure
|
// Create a small scratch buffer used during build of the top level acceleration structure
|
||||||
|
|
|
||||||
|
|
@ -506,7 +506,6 @@ public:
|
||||||
{
|
{
|
||||||
uniformData.projection = camera.matrices.perspective;
|
uniformData.projection = camera.matrices.perspective;
|
||||||
uniformData.view = camera.matrices.view;
|
uniformData.view = camera.matrices.view;
|
||||||
// @todo: paused
|
|
||||||
uniformData.model = glm::rotate(glm::mat4(1.0f), glm::radians(timer * 360.0f), glm::vec3(1.0f, 0.0f, 0.0f));
|
uniformData.model = glm::rotate(glm::mat4(1.0f), glm::radians(timer * 360.0f), glm::vec3(1.0f, 0.0f, 0.0f));
|
||||||
uniformData.viewPos = glm::vec4(camera.position, 0.0f) * glm::vec4(-1.0f);
|
uniformData.viewPos = glm::vec4(camera.position, 0.0f) * glm::vec4(-1.0f);
|
||||||
memcpy(uniformBuffer.mapped, &uniformData, sizeof(uniformData));
|
memcpy(uniformBuffer.mapped, &uniformData, sizeof(uniformData));
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,6 @@ public:
|
||||||
} vertexAttributeBuffers;
|
} vertexAttributeBuffers;
|
||||||
|
|
||||||
// Buffers for the separate vertex attributes
|
// Buffers for the separate vertex attributes
|
||||||
// @todo: rename
|
|
||||||
struct SeparateVertexBuffers {
|
struct SeparateVertexBuffers {
|
||||||
vks::Buffer pos, normal, uv, tangent;
|
vks::Buffer pos, normal, uv, tangent;
|
||||||
} separateVertexBuffers;
|
} separateVertexBuffers;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue