layers: Cleanup unused includes and bool expr

spencer-lunarg · Jul 12, 2023 · 4f4dc90 · 4f4dc90
1 parent c2ac4d6
commit 4f4dc90
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp
@@ -746,8 +746,8 @@ static bool writePPM(const char *filename, VkImage image1) {
     if (destformat == format) {
         copyOnly = true;
     } else {
-        bool const bltLinear = targetFormatProps.linearTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT ? true : false;
-        bool const bltOptimal = targetFormatProps.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT ? true : false;
+        bool const bltLinear = targetFormatProps.linearTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT;
+        bool const bltOptimal = targetFormatProps.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT;
         if (!bltLinear && !bltOptimal) {
             // Cannot blit to either target tiling type.  It should be pretty
             // unlikely to have a device that cannot blit to either type.

diff --git a/vkconfig/main.cpp b/vkconfig/main.cpp
@@ -24,8 +24,6 @@
 #include "main_doc.h"
 #include "main_signal.h"
 
-#include "../vkconfig_core/command_line.h"
-
 #include <cassert>
 
 int main(int argc, char* argv[]) {

diff --git a/vkconfig/main_gui.cpp b/vkconfig/main_gui.cpp
@@ -68,7 +68,7 @@ int run_gui(int argc, char* argv[], const CommandLine& command_line) {
     // We simply cannot run without any layers
     Configurator& configurator = Configurator::Get(command_line.command_vulkan_sdk);
 
-    if (configurator.Init() == false) return -1;
+    if (!configurator.Init()) return -1;
 
     // The main GUI is driven here
     MainWindow main_window;

diff --git a/vku/vk_layer_settings.cpp b/vku/vk_layer_settings.cpp
@@ -37,8 +37,6 @@
 #include <regex>
 #include <sys/stat.h>
 
-#include <vulkan/vk_layer.h>
-
 #if defined(_WIN32)
 #include <windows.h>
 #include <direct.h>