diff --git a/ext/imgui b/ext/imgui index 8836975dcfc770731932ebec3bbb69579fb29071..ea3fc7603829a420d77ccb2862178bc2334b4b54 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 cea35f12347b9d9ab9b1acb59f96828992c5494c..9f5504aaa276a821ab2042fdf977e12419792eff 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 ea10902672cc41e1c7a6de71106812145bbc93be..d8ea637bcd8fbfde1f17e4721fb4618420bcdd34 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 22fd13911dfacad6edd8a1d1d959a7cfa6ae2e7a..9ef499053d58bd3b26b9621e6815409bcbfae783 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;