Skip to content

Commit f60897c

Browse files
committed
refactor(linux): improve code readability
1 parent 7d976cc commit f60897c

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

src/Application.cpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -784,23 +784,22 @@ void Application::createDescriptorSets() {
784784
imageInfo.imageView = textureImageView;
785785
imageInfo.sampler = textureSampler;
786786

787-
std::array<vk::WriteDescriptorSet, 2> descriptorWrites;
788-
789-
descriptorWrites[0].dstSet = m_descriptorSets[i];
790-
descriptorWrites[0].dstBinding = 0;
791-
descriptorWrites[0].dstArrayElement = 0;
792-
descriptorWrites[0].descriptorType = vk::DescriptorType::eUniformBuffer;
793-
descriptorWrites[0].descriptorCount = 1;
794-
descriptorWrites[0].pBufferInfo = &bufferInfo;
795-
796-
descriptorWrites[1].dstSet = m_descriptorSets[i];
797-
descriptorWrites[1].dstBinding = 1;
798-
descriptorWrites[1].dstArrayElement = 0;
799-
descriptorWrites[1].descriptorType =
800-
vk::DescriptorType::eCombinedImageSampler;
801-
descriptorWrites[1].descriptorCount = 1;
802-
descriptorWrites[1].pImageInfo = &imageInfo;
803-
787+
const std::array descriptorWrites{
788+
vk::WriteDescriptorSet()
789+
.setDstSet(m_descriptorSets[i])
790+
.setDstBinding(0)
791+
.setDstArrayElement(0)
792+
.setDescriptorType(vk::DescriptorType::eUniformBuffer)
793+
.setDescriptorCount(1)
794+
.setPBufferInfo(&bufferInfo),
795+
796+
vk::WriteDescriptorSet()
797+
.setDstSet(m_descriptorSets[i])
798+
.setDstBinding(1)
799+
.setDstArrayElement(0)
800+
.setDescriptorType(vk::DescriptorType::eCombinedImageSampler)
801+
.setDescriptorCount(1)
802+
.setPImageInfo(&imageInfo)};
804803

805804
m_device.updateDescriptorSets(descriptorWrites, {});
806805
}

src/Vertex.cpp

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,25 @@ vk::VertexInputBindingDescription Vertex::getBindingDescription() {
1010

1111
std::array<vk::VertexInputAttributeDescription, 3>
1212
Vertex::getAttributeDescriptions() {
13-
std::array<vk::VertexInputAttributeDescription, 3> attributeDescriptions{};
13+
const std::array attributeDescriptions{
14+
vk::VertexInputAttributeDescription()
15+
.setBinding(0)
16+
.setLocation(0)
17+
.setFormat(vk::Format::eR32G32Sfloat)
18+
.setOffset(offsetof(Vertex, pos)),
1419

15-
attributeDescriptions[0].binding = 0;
16-
attributeDescriptions[0].location = 0;
17-
attributeDescriptions[0].format = vk::Format::eR32G32Sfloat;
18-
attributeDescriptions[0].offset = offsetof(Vertex, pos);
20+
vk::VertexInputAttributeDescription()
21+
.setBinding(0)
22+
.setLocation(1)
23+
.setFormat(vk::Format::eR32G32B32Sfloat)
24+
.setOffset(offsetof(Vertex, color)),
1925

20-
attributeDescriptions[1].binding = 0;
21-
attributeDescriptions[1].location = 1;
22-
attributeDescriptions[1].format = vk::Format::eR32G32B32Sfloat;
23-
attributeDescriptions[1].offset = offsetof(Vertex, color);
26+
vk::VertexInputAttributeDescription()
27+
.setBinding(0)
28+
.setLocation(2)
29+
.setFormat(vk::Format::eR32G32Sfloat)
30+
.setOffset(offsetof(Vertex, texCoord))};
2431

25-
attributeDescriptions[2].binding = 0;
26-
attributeDescriptions[2].location = 2;
27-
attributeDescriptions[2].format = vk::Format::eR32G32Sfloat;
28-
attributeDescriptions[2].offset = offsetof(Vertex, texCoord);
2932

3033
return attributeDescriptions;
3134
}

0 commit comments

Comments
 (0)