Skip to content

Commit aaa41b7

Browse files
committed
Remove redundant queueCount checks
1 parent da265d3 commit aaa41b7

31 files changed

+91
-91
lines changed

code/03_physical_device_selection.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class HelloTriangleApplication {
125125
createInfo.pNext = (VkDebugUtilsMessengerCreateInfoEXT*) &debugCreateInfo;
126126
} else {
127127
createInfo.enabledLayerCount = 0;
128-
128+
129129
createInfo.pNext = nullptr;
130130
}
131131

@@ -193,7 +193,7 @@ class HelloTriangleApplication {
193193

194194
int i = 0;
195195
for (const auto& queueFamily : queueFamilies) {
196-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
196+
if (queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
197197
indices.graphicsFamily = i;
198198
}
199199

code/04_logical_device.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class HelloTriangleApplication {
131131
createInfo.pNext = (VkDebugUtilsMessengerCreateInfoEXT*) &debugCreateInfo;
132132
} else {
133133
createInfo.enabledLayerCount = 0;
134-
134+
135135
createInfo.pNext = nullptr;
136136
}
137137

@@ -236,7 +236,7 @@ class HelloTriangleApplication {
236236

237237
int i = 0;
238238
for (const auto& queueFamily : queueFamilies) {
239-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
239+
if (queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
240240
indices.graphicsFamily = i;
241241
}
242242

code/05_window_surface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class HelloTriangleApplication {
137137
createInfo.pNext = (VkDebugUtilsMessengerCreateInfoEXT*) &debugCreateInfo;
138138
} else {
139139
createInfo.enabledLayerCount = 0;
140-
140+
141141
createInfo.pNext = nullptr;
142142
}
143143

@@ -254,7 +254,7 @@ class HelloTriangleApplication {
254254

255255
int i = 0;
256256
for (const auto& queueFamily : queueFamilies) {
257-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
257+
if (queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
258258
indices.graphicsFamily = i;
259259
}
260260

code/06_swap_chain_creation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,14 +408,14 @@ class HelloTriangleApplication {
408408

409409
int i = 0;
410410
for (const auto& queueFamily : queueFamilies) {
411-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
411+
if (queueFamily.queueCount && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
412412
indices.graphicsFamily = i;
413413
}
414414

415415
VkBool32 presentSupport = false;
416416
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
417417

418-
if (queueFamily.queueCount > 0 && presentSupport) {
418+
if (queueFamily.queueCount && presentSupport) {
419419
indices.presentFamily = i;
420420
}
421421

code/07_image_views.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,14 +439,14 @@ class HelloTriangleApplication {
439439

440440
int i = 0;
441441
for (const auto& queueFamily : queueFamilies) {
442-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
442+
if (queueFamily.queueCount && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
443443
indices.graphicsFamily = i;
444444
}
445445

446446
VkBool32 presentSupport = false;
447447
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
448448

449-
if (queueFamily.queueCount > 0 && presentSupport) {
449+
if (queueFamily.queueCount && presentSupport) {
450450
indices.presentFamily = i;
451451
}
452452

code/08_graphics_pipeline.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,14 @@ class HelloTriangleApplication {
444444

445445
int i = 0;
446446
for (const auto& queueFamily : queueFamilies) {
447-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
447+
if (queueFamily.queueCount && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
448448
indices.graphicsFamily = i;
449449
}
450450

451451
VkBool32 presentSupport = false;
452452
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
453453

454-
if (queueFamily.queueCount > 0 && presentSupport) {
454+
if (queueFamily.queueCount && presentSupport) {
455455
indices.presentFamily = i;
456456
}
457457

code/09_shader_modules.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,14 +480,14 @@ class HelloTriangleApplication {
480480

481481
int i = 0;
482482
for (const auto& queueFamily : queueFamilies) {
483-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
483+
if (queueFamily.queueCount && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
484484
indices.graphicsFamily = i;
485485
}
486486

487487
VkBool32 presentSupport = false;
488488
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
489489

490-
if (queueFamily.queueCount > 0 && presentSupport) {
490+
if (queueFamily.queueCount && presentSupport) {
491491
indices.presentFamily = i;
492492
}
493493

code/10_fixed_functions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,14 @@ class HelloTriangleApplication {
552552

553553
int i = 0;
554554
for (const auto& queueFamily : queueFamilies) {
555-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
555+
if (queueFamily.queueCount && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
556556
indices.graphicsFamily = i;
557557
}
558558

559559
VkBool32 presentSupport = false;
560560
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
561561

562-
if (queueFamily.queueCount > 0 && presentSupport) {
562+
if (queueFamily.queueCount && presentSupport) {
563563
indices.presentFamily = i;
564564
}
565565

code/11_render_passes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,14 +587,14 @@ class HelloTriangleApplication {
587587

588588
int i = 0;
589589
for (const auto& queueFamily : queueFamilies) {
590-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
590+
if (queueFamily.queueCount && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
591591
indices.graphicsFamily = i;
592592
}
593593

594594
VkBool32 presentSupport = false;
595595
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
596596

597-
if (queueFamily.queueCount > 0 && presentSupport) {
597+
if (queueFamily.queueCount && presentSupport) {
598598
indices.presentFamily = i;
599599
}
600600

code/12_graphics_pipeline_complete.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,14 +608,14 @@ class HelloTriangleApplication {
608608

609609
int i = 0;
610610
for (const auto& queueFamily : queueFamilies) {
611-
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
611+
if (queueFamily.queueCount && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
612612
indices.graphicsFamily = i;
613613
}
614614

615615
VkBool32 presentSupport = false;
616616
vkGetPhysicalDeviceSurfaceSupportKHR(device, i, surface, &presentSupport);
617617

618-
if (queueFamily.queueCount > 0 && presentSupport) {
618+
if (queueFamily.queueCount && presentSupport) {
619619
indices.presentFamily = i;
620620
}
621621

0 commit comments

Comments
 (0)