From 7168170e5c966a224280d49600f927c39b25f3eb Mon Sep 17 00:00:00 2001 From: Lava Block <the@lava-block.com> Date: Tue, 18 Feb 2020 13:50:59 +0100 Subject: [PATCH] remove VK_LAYER_LUNARG_assistant_layer and add VK_LAYER_KHRONOS_validation --- ext/imgui | 2 +- liblava/base/instance.cpp | 13 +++---------- liblava/base/instance.hpp | 2 -- liblava/frame/frame.cpp | 6 ------ 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/ext/imgui b/ext/imgui index 8836975d..ea3fc760 160000 --- a/ext/imgui +++ b/ext/imgui @@ -1 +1 @@ -Subproject commit 8836975dcfc770731932ebec3bbb69579fb29071 +Subproject commit ea3fc7603829a420d77ccb2862178bc2334b4b54 diff --git a/liblava/base/instance.cpp b/liblava/base/instance.cpp index cea35f12..9f5504aa 100644 --- a/liblava/base/instance.cpp +++ b/liblava/base/instance.cpp @@ -5,8 +5,7 @@ #include <liblava/base/instance.hpp> #include <liblava/base/memory.hpp> -#define VK_LAYER_LUNARG_STANDARD_VALIDATION_NAME "VK_LAYER_LUNARG_standard_validation" -#define VK_LAYER_LUNARG_ASSISTENT_LAYER_NAME "VK_LAYER_LUNARG_assistant_layer" +#define VK_LAYER_KHRONOS_VALIDATION_NAME "VK_LAYER_KHRONOS_validation" #define VK_LAYER_RENDERDOC_CAPTURE_NAME "VK_LAYER_RENDERDOC_Capture" namespace lava { @@ -23,8 +22,8 @@ bool instance::create(create_param& param, debug_config::ref d, app_info::ref i) if (debug.validation) { - if (!exists(param.layers, VK_LAYER_LUNARG_STANDARD_VALIDATION_NAME)) - param.layers.push_back(VK_LAYER_LUNARG_STANDARD_VALIDATION_NAME); + if (!exists(param.layers, VK_LAYER_KHRONOS_VALIDATION_NAME)) + param.layers.push_back(VK_LAYER_KHRONOS_VALIDATION_NAME); } if (debug.render_doc) { @@ -33,12 +32,6 @@ bool instance::create(create_param& param, debug_config::ref d, app_info::ref i) param.layers.push_back(VK_LAYER_RENDERDOC_CAPTURE_NAME); } - if (debug.assistent) { - - if (!exists(param.layers, VK_LAYER_LUNARG_ASSISTENT_LAYER_NAME)) - param.layers.push_back(VK_LAYER_LUNARG_ASSISTENT_LAYER_NAME); - } - if (debug.utils) { if (!exists(param.extensions, VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) diff --git a/liblava/base/instance.hpp b/liblava/base/instance.hpp index ea109026..d8ea637b 100644 --- a/liblava/base/instance.hpp +++ b/liblava/base/instance.hpp @@ -23,11 +23,9 @@ struct instance : no_copy_no_move { using ref = debug_config const&; bool validation = false; - bool assistent = false; bool render_doc = false; bool verbose = false; bool utils = false; - bool info = false; }; enum class api_version : type { diff --git a/liblava/frame/frame.cpp b/liblava/frame/frame.cpp index 22fd1391..9ef49905 100644 --- a/liblava/frame/frame.cpp +++ b/liblava/frame/frame.cpp @@ -102,9 +102,6 @@ bool frame::setup(frame_config c) { if (cmd_line[{ "-d", "--debug" }]) config.debug.validation = true; - if (cmd_line[{ "-a", "--assist" }]) - config.debug.assistent = true; - if (cmd_line[{ "-r", "--renderdoc" }]) config.debug.render_doc = true; @@ -114,9 +111,6 @@ bool frame::setup(frame_config c) { if (cmd_line[{ "-u", "--utils" }]) config.debug.utils = true; - if (cmd_line[{ "-i", "--info" }]) - config.debug.info = true; - if (auto log_level = -1; cmd_line({ "-l", "--log" }) >> log_level) config.log.level = log_level; -- GitLab