Skip to content

Commit 1778b46

Browse files
asuessenbachasuessenbach
authored
Align docu in 03_Drawing_a_triangle.adoc and the sources in 10_fixed_functions.cpp (KhronosGroup#330)
1 parent 1703ec4 commit 1778b46

15 files changed

Lines changed: 252 additions & 178 deletions

‎attachments/10_fixed_functions.cpp‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,22 +318,27 @@ class HelloTriangleApplication
318318
vk::PipelineInputAssemblyStateCreateInfo inputAssembly{.topology = vk::PrimitiveTopology::eTriangleList};
319319
vk::PipelineViewportStateCreateInfo viewportState{.viewportCount = 1, .scissorCount = 1};
320320

321-
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False, .rasterizerDiscardEnable = vk::False, .polygonMode = vk::PolygonMode::eFill, .cullMode = vk::CullModeFlagBits::eBack, .frontFace = vk::FrontFace::eClockwise, .depthBiasEnable = vk::False, .depthBiasSlopeFactor = 1.0f, .lineWidth = 1.0f};
321+
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False,
322+
.rasterizerDiscardEnable = vk::False,
323+
.polygonMode = vk::PolygonMode::eFill,
324+
.cullMode = vk::CullModeFlagBits::eBack,
325+
.frontFace = vk::FrontFace::eClockwise,
326+
.depthBiasEnable = vk::False,
327+
.lineWidth = 1.0f};
322328

323329
vk::PipelineMultisampleStateCreateInfo multisampling{.rasterizationSamples = vk::SampleCountFlagBits::e1, .sampleShadingEnable = vk::False};
324330

325-
vk::PipelineColorBlendAttachmentState colorBlendAttachment{.blendEnable = vk::False,
326-
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
331+
vk::PipelineColorBlendAttachmentState colorBlendAttachment{
332+
.blendEnable = vk::False,
333+
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
327334

328-
vk::PipelineColorBlendStateCreateInfo colorBlending{.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
335+
vk::PipelineColorBlendStateCreateInfo colorBlending{
336+
.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
329337

330-
std::vector dynamicStates = {
331-
vk::DynamicState::eViewport,
332-
vk::DynamicState::eScissor};
338+
std::vector<vk::DynamicState> dynamicStates = {vk::DynamicState::eViewport, vk::DynamicState::eScissor};
333339
vk::PipelineDynamicStateCreateInfo dynamicState{.dynamicStateCount = static_cast<uint32_t>(dynamicStates.size()), .pDynamicStates = dynamicStates.data()};
334340

335-
vk::PipelineLayoutCreateInfo pipelineLayoutInfo;
336-
341+
vk::PipelineLayoutCreateInfo pipelineLayoutInfo{.setLayoutCount = 0, .pushConstantRangeCount = 0};
337342
pipelineLayout = vk::raii::PipelineLayout(device, pipelineLayoutInfo);
338343
}
339344

‎attachments/12_graphics_pipeline_complete.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -315,26 +315,32 @@ class HelloTriangleApplication
315315
vk::PipelineShaderStageCreateInfo fragShaderStageInfo{.stage = vk::ShaderStageFlagBits::eFragment, .module = shaderModule, .pName = "fragMain"};
316316
vk::PipelineShaderStageCreateInfo shaderStages[] = {vertShaderStageInfo, fragShaderStageInfo};
317317

318+
318319
vk::PipelineVertexInputStateCreateInfo vertexInputInfo;
319320
vk::PipelineInputAssemblyStateCreateInfo inputAssembly{.topology = vk::PrimitiveTopology::eTriangleList};
320321
vk::PipelineViewportStateCreateInfo viewportState{.viewportCount = 1, .scissorCount = 1};
321322

322-
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False, .rasterizerDiscardEnable = vk::False, .polygonMode = vk::PolygonMode::eFill, .cullMode = vk::CullModeFlagBits::eBack, .frontFace = vk::FrontFace::eClockwise, .depthBiasEnable = vk::False, .depthBiasSlopeFactor = 1.0f, .lineWidth = 1.0f};
323+
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False,
324+
.rasterizerDiscardEnable = vk::False,
325+
.polygonMode = vk::PolygonMode::eFill,
326+
.cullMode = vk::CullModeFlagBits::eBack,
327+
.frontFace = vk::FrontFace::eClockwise,
328+
.depthBiasEnable = vk::False,
329+
.lineWidth = 1.0f};
323330

324331
vk::PipelineMultisampleStateCreateInfo multisampling{.rasterizationSamples = vk::SampleCountFlagBits::e1, .sampleShadingEnable = vk::False};
325332

326-
vk::PipelineColorBlendAttachmentState colorBlendAttachment{.blendEnable = vk::False,
327-
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
333+
vk::PipelineColorBlendAttachmentState colorBlendAttachment{
334+
.blendEnable = vk::False,
335+
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
328336

329-
vk::PipelineColorBlendStateCreateInfo colorBlending{.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
337+
vk::PipelineColorBlendStateCreateInfo colorBlending{
338+
.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
330339

331-
std::vector dynamicStates = {
332-
vk::DynamicState::eViewport,
333-
vk::DynamicState::eScissor};
340+
std::vector<vk::DynamicState> dynamicStates = {vk::DynamicState::eViewport, vk::DynamicState::eScissor};
334341
vk::PipelineDynamicStateCreateInfo dynamicState{.dynamicStateCount = static_cast<uint32_t>(dynamicStates.size()), .pDynamicStates = dynamicStates.data()};
335342

336343
vk::PipelineLayoutCreateInfo pipelineLayoutInfo{.setLayoutCount = 0, .pushConstantRangeCount = 0};
337-
338344
pipelineLayout = vk::raii::PipelineLayout(device, pipelineLayoutInfo);
339345

340346
vk::StructureChain<vk::GraphicsPipelineCreateInfo, vk::PipelineRenderingCreateInfo> pipelineCreateInfoChain = {

‎attachments/14_command_buffers.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,26 +319,32 @@ class HelloTriangleApplication
319319
vk::PipelineShaderStageCreateInfo fragShaderStageInfo{.stage = vk::ShaderStageFlagBits::eFragment, .module = shaderModule, .pName = "fragMain"};
320320
vk::PipelineShaderStageCreateInfo shaderStages[] = {vertShaderStageInfo, fragShaderStageInfo};
321321

322+
322323
vk::PipelineVertexInputStateCreateInfo vertexInputInfo;
323324
vk::PipelineInputAssemblyStateCreateInfo inputAssembly{.topology = vk::PrimitiveTopology::eTriangleList};
324325
vk::PipelineViewportStateCreateInfo viewportState{.viewportCount = 1, .scissorCount = 1};
325326

326-
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False, .rasterizerDiscardEnable = vk::False, .polygonMode = vk::PolygonMode::eFill, .cullMode = vk::CullModeFlagBits::eBack, .frontFace = vk::FrontFace::eClockwise, .depthBiasEnable = vk::False, .depthBiasSlopeFactor = 1.0f, .lineWidth = 1.0f};
327+
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False,
328+
.rasterizerDiscardEnable = vk::False,
329+
.polygonMode = vk::PolygonMode::eFill,
330+
.cullMode = vk::CullModeFlagBits::eBack,
331+
.frontFace = vk::FrontFace::eClockwise,
332+
.depthBiasEnable = vk::False,
333+
.lineWidth = 1.0f};
327334

328335
vk::PipelineMultisampleStateCreateInfo multisampling{.rasterizationSamples = vk::SampleCountFlagBits::e1, .sampleShadingEnable = vk::False};
329336

330-
vk::PipelineColorBlendAttachmentState colorBlendAttachment{.blendEnable = vk::False,
331-
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
337+
vk::PipelineColorBlendAttachmentState colorBlendAttachment{
338+
.blendEnable = vk::False,
339+
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
332340

333-
vk::PipelineColorBlendStateCreateInfo colorBlending{.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
341+
vk::PipelineColorBlendStateCreateInfo colorBlending{
342+
.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
334343

335-
std::vector dynamicStates = {
336-
vk::DynamicState::eViewport,
337-
vk::DynamicState::eScissor};
344+
std::vector<vk::DynamicState> dynamicStates = {vk::DynamicState::eViewport, vk::DynamicState::eScissor};
338345
vk::PipelineDynamicStateCreateInfo dynamicState{.dynamicStateCount = static_cast<uint32_t>(dynamicStates.size()), .pDynamicStates = dynamicStates.data()};
339346

340347
vk::PipelineLayoutCreateInfo pipelineLayoutInfo{.setLayoutCount = 0, .pushConstantRangeCount = 0};
341-
342348
pipelineLayout = vk::raii::PipelineLayout(device, pipelineLayoutInfo);
343349

344350
vk::StructureChain<vk::GraphicsPipelineCreateInfo, vk::PipelineRenderingCreateInfo> pipelineCreateInfoChain = {

‎attachments/15_hello_triangle.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,26 +328,32 @@ class HelloTriangleApplication
328328
vk::PipelineShaderStageCreateInfo fragShaderStageInfo{.stage = vk::ShaderStageFlagBits::eFragment, .module = shaderModule, .pName = "fragMain"};
329329
vk::PipelineShaderStageCreateInfo shaderStages[] = {vertShaderStageInfo, fragShaderStageInfo};
330330

331+
331332
vk::PipelineVertexInputStateCreateInfo vertexInputInfo;
332333
vk::PipelineInputAssemblyStateCreateInfo inputAssembly{.topology = vk::PrimitiveTopology::eTriangleList};
333334
vk::PipelineViewportStateCreateInfo viewportState{.viewportCount = 1, .scissorCount = 1};
334335

335-
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False, .rasterizerDiscardEnable = vk::False, .polygonMode = vk::PolygonMode::eFill, .cullMode = vk::CullModeFlagBits::eBack, .frontFace = vk::FrontFace::eClockwise, .depthBiasEnable = vk::False, .depthBiasSlopeFactor = 1.0f, .lineWidth = 1.0f};
336+
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False,
337+
.rasterizerDiscardEnable = vk::False,
338+
.polygonMode = vk::PolygonMode::eFill,
339+
.cullMode = vk::CullModeFlagBits::eBack,
340+
.frontFace = vk::FrontFace::eClockwise,
341+
.depthBiasEnable = vk::False,
342+
.lineWidth = 1.0f};
336343

337344
vk::PipelineMultisampleStateCreateInfo multisampling{.rasterizationSamples = vk::SampleCountFlagBits::e1, .sampleShadingEnable = vk::False};
338345

339-
vk::PipelineColorBlendAttachmentState colorBlendAttachment{.blendEnable = vk::False,
340-
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
346+
vk::PipelineColorBlendAttachmentState colorBlendAttachment{
347+
.blendEnable = vk::False,
348+
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
341349

342-
vk::PipelineColorBlendStateCreateInfo colorBlending{.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
350+
vk::PipelineColorBlendStateCreateInfo colorBlending{
351+
.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
343352

344-
std::vector dynamicStates = {
345-
vk::DynamicState::eViewport,
346-
vk::DynamicState::eScissor};
353+
std::vector<vk::DynamicState> dynamicStates = {vk::DynamicState::eViewport, vk::DynamicState::eScissor};
347354
vk::PipelineDynamicStateCreateInfo dynamicState{.dynamicStateCount = static_cast<uint32_t>(dynamicStates.size()), .pDynamicStates = dynamicStates.data()};
348355

349356
vk::PipelineLayoutCreateInfo pipelineLayoutInfo{.setLayoutCount = 0, .pushConstantRangeCount = 0};
350-
351357
pipelineLayout = vk::raii::PipelineLayout(device, pipelineLayoutInfo);
352358

353359
vk::StructureChain<vk::GraphicsPipelineCreateInfo, vk::PipelineRenderingCreateInfo> pipelineCreateInfoChain = {

‎attachments/16_frames_in_flight.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -331,26 +331,32 @@ class HelloTriangleApplication
331331
vk::PipelineShaderStageCreateInfo fragShaderStageInfo{.stage = vk::ShaderStageFlagBits::eFragment, .module = shaderModule, .pName = "fragMain"};
332332
vk::PipelineShaderStageCreateInfo shaderStages[] = {vertShaderStageInfo, fragShaderStageInfo};
333333

334+
334335
vk::PipelineVertexInputStateCreateInfo vertexInputInfo;
335336
vk::PipelineInputAssemblyStateCreateInfo inputAssembly{.topology = vk::PrimitiveTopology::eTriangleList};
336337
vk::PipelineViewportStateCreateInfo viewportState{.viewportCount = 1, .scissorCount = 1};
337338

338-
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False, .rasterizerDiscardEnable = vk::False, .polygonMode = vk::PolygonMode::eFill, .cullMode = vk::CullModeFlagBits::eBack, .frontFace = vk::FrontFace::eClockwise, .depthBiasEnable = vk::False, .depthBiasSlopeFactor = 1.0f, .lineWidth = 1.0f};
339+
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False,
340+
.rasterizerDiscardEnable = vk::False,
341+
.polygonMode = vk::PolygonMode::eFill,
342+
.cullMode = vk::CullModeFlagBits::eBack,
343+
.frontFace = vk::FrontFace::eClockwise,
344+
.depthBiasEnable = vk::False,
345+
.lineWidth = 1.0f};
339346

340347
vk::PipelineMultisampleStateCreateInfo multisampling{.rasterizationSamples = vk::SampleCountFlagBits::e1, .sampleShadingEnable = vk::False};
341348

342-
vk::PipelineColorBlendAttachmentState colorBlendAttachment{.blendEnable = vk::False,
343-
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
349+
vk::PipelineColorBlendAttachmentState colorBlendAttachment{
350+
.blendEnable = vk::False,
351+
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
344352

345-
vk::PipelineColorBlendStateCreateInfo colorBlending{.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
353+
vk::PipelineColorBlendStateCreateInfo colorBlending{
354+
.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
346355

347-
std::vector dynamicStates = {
348-
vk::DynamicState::eViewport,
349-
vk::DynamicState::eScissor};
356+
std::vector<vk::DynamicState> dynamicStates = {vk::DynamicState::eViewport, vk::DynamicState::eScissor};
350357
vk::PipelineDynamicStateCreateInfo dynamicState{.dynamicStateCount = static_cast<uint32_t>(dynamicStates.size()), .pDynamicStates = dynamicStates.data()};
351358

352359
vk::PipelineLayoutCreateInfo pipelineLayoutInfo{.setLayoutCount = 0, .pushConstantRangeCount = 0};
353-
354360
pipelineLayout = vk::raii::PipelineLayout(device, pipelineLayoutInfo);
355361

356362
vk::StructureChain<vk::GraphicsPipelineCreateInfo, vk::PipelineRenderingCreateInfo> pipelineCreateInfoChain = {

‎attachments/17_swap_chain_recreation.cpp‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -368,22 +368,27 @@ class HelloTriangleApplication
368368
vk::PipelineInputAssemblyStateCreateInfo inputAssembly{.topology = vk::PrimitiveTopology::eTriangleList};
369369
vk::PipelineViewportStateCreateInfo viewportState{.viewportCount = 1, .scissorCount = 1};
370370

371-
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False, .rasterizerDiscardEnable = vk::False, .polygonMode = vk::PolygonMode::eFill, .cullMode = vk::CullModeFlagBits::eBack, .frontFace = vk::FrontFace::eClockwise, .depthBiasEnable = vk::False, .depthBiasSlopeFactor = 1.0f, .lineWidth = 1.0f};
371+
vk::PipelineRasterizationStateCreateInfo rasterizer{.depthClampEnable = vk::False,
372+
.rasterizerDiscardEnable = vk::False,
373+
.polygonMode = vk::PolygonMode::eFill,
374+
.cullMode = vk::CullModeFlagBits::eBack,
375+
.frontFace = vk::FrontFace::eClockwise,
376+
.depthBiasEnable = vk::False,
377+
.lineWidth = 1.0f};
372378

373379
vk::PipelineMultisampleStateCreateInfo multisampling{.rasterizationSamples = vk::SampleCountFlagBits::e1, .sampleShadingEnable = vk::False};
374380

375-
vk::PipelineColorBlendAttachmentState colorBlendAttachment{.blendEnable = vk::False,
376-
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
381+
vk::PipelineColorBlendAttachmentState colorBlendAttachment{
382+
.blendEnable = vk::False,
383+
.colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA};
377384

378-
vk::PipelineColorBlendStateCreateInfo colorBlending{.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
385+
vk::PipelineColorBlendStateCreateInfo colorBlending{
386+
.logicOpEnable = vk::False, .logicOp = vk::LogicOp::eCopy, .attachmentCount = 1, .pAttachments = &colorBlendAttachment};
379387

380-
std::vector dynamicStates = {
381-
vk::DynamicState::eViewport,
382-
vk::DynamicState::eScissor};
388+
std::vector<vk::DynamicState> dynamicStates = {vk::DynamicState::eViewport, vk::DynamicState::eScissor};
383389
vk::PipelineDynamicStateCreateInfo dynamicState{.dynamicStateCount = static_cast<uint32_t>(dynamicStates.size()), .pDynamicStates = dynamicStates.data()};
384390

385391
vk::PipelineLayoutCreateInfo pipelineLayoutInfo{.setLayoutCount = 0, .pushConstantRangeCount = 0};
386-
387392
pipelineLayout = vk::raii::PipelineLayout(device, pipelineLayoutInfo);
388393

389394
vk::StructureChain<vk::GraphicsPipelineCreateInfo, vk::PipelineRenderingCreateInfo> pipelineCreateInfoChain = {

0 commit comments

Comments
 (0)