layers: Generic- update extension and layer support
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 85b25a1..7b3b97b 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -83,7 +83,7 @@
vk_struct_graphviz_helper.h
)
-#run_vk_layer_generate(Generic generic_layer.cpp)
+run_vk_layer_generate(Generic generic_layer.cpp)
run_vk_layer_generate(APIDump api_dump.cpp)
run_vk_layer_generate(ObjectTracker object_track.cpp)
run_vk_layer_generate(Threading threading.cpp)
@@ -104,7 +104,7 @@
add_vk_layer(ParamChecker param_checker.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
add_vk_layer(ScreenShot screenshot.cpp vk_layer_table.cpp)
# generated
-#add_vk_layer(Generic generic_layer.cpp vk_layer_table.cpp)
+add_vk_layer(Generic generic_layer.cpp vk_layer_table.cpp)
add_vk_layer(APIDump api_dump.cpp vk_layer_table.cpp)
add_vk_layer(ObjectTracker object_track.cpp vk_layer_table.cpp)
add_vk_layer(Threading threading.cpp vk_layer_table.cpp)
diff --git a/layers/generic.h b/layers/generic.h
index d72ab31..d74d985 100644
--- a/layers/generic.h
+++ b/layers/generic.h
@@ -27,14 +27,13 @@
#ifndef GENERIC_H
#define GENERIC_H
-#include "vkLayer.h"
+#include "vk_layer.h"
/*
* This file contains static functions for the generated layer Generic
*/
-#define LAYER_PROPS_ARRAY_SIZE 1
-static const VkLayerProperties layerProps[LAYER_PROPS_ARRAY_SIZE] = {
+static const VkLayerProperties globalLayerProps[] = {
{
"Generic",
VK_API_VERSION, // specVersion
@@ -43,8 +42,7 @@
}
};
-#define LAYER_DEV_PROPS_ARRAY_SIZE 1
-static const VkLayerProperties layerDevProps[LAYER_DEV_PROPS_ARRAY_SIZE] = {
+static const VkLayerProperties deviceLayerProps[] = {
{
"Generic",
VK_API_VERSION, // specVersion