layers: Wrap up windows/test issues with DrawState/ShaderChecker merge
diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk
index 4c32dce..7711844 100644
--- a/buildAndroid/jni/Android.mk
+++ b/buildAndroid/jni/Android.mk
@@ -59,17 +59,6 @@
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_MODULE := VKLayerShaderCheker
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/shader_checker.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/include \
- $(SRC_DIR)/buildAndroid/generated \
- $(SRC_DIR)/loader
-LOCAL_SHARED_LIBRARIES += layer_utils
-LOCAL_LDLIBS := -llog
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
LOCAL_MODULE := VKLayerImage
LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 63a79dc..905861f 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -25,7 +25,6 @@
object_tracker
param_checker
screenshot
- shader_checker
swapchain
threading
device_limits
diff --git a/layers/draw_state.h b/layers/draw_state.h
index c430419..33d4828 100755
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -32,21 +32,6 @@
using std::vector;
-/* Shader checker error codes */
-typedef enum _SHADER_CHECKER_ERROR
-{
- SHADER_CHECKER_NONE,
- SHADER_CHECKER_FS_MIXED_BROADCAST, /* FS writes broadcast output AND custom outputs */
- SHADER_CHECKER_INTERFACE_TYPE_MISMATCH, /* Type mismatch between shader stages or shader and pipeline */
- SHADER_CHECKER_OUTPUT_NOT_CONSUMED, /* Entry appears in output interface, but missing in input */
- SHADER_CHECKER_INPUT_NOT_PRODUCED, /* Entry appears in input interface, but missing in output */
- SHADER_CHECKER_NON_SPIRV_SHADER, /* Shader image is not SPIR-V */
- SHADER_CHECKER_INCONSISTENT_SPIRV, /* General inconsistency within a SPIR-V module */
- SHADER_CHECKER_UNKNOWN_STAGE, /* Stage is not supported by analysis */
- SHADER_CHECKER_INCONSISTENT_VI, /* VI state contains conflicting binding or attrib descriptions */
- SHADER_CHECKER_MISSING_DESCRIPTOR, /* Shader attempts to use a descriptor binding not declared in the layout */
-} SHADER_CHECKER_ERROR;
-
// Draw State ERROR codes
typedef enum _DRAW_STATE_ERROR
{
@@ -106,6 +91,19 @@
DRAWSTATE_BUFFERINFO_DESCRIPTOR_ERROR, // A Descriptor of *_[UNIFORM|STORAGE]_BUFFER_[DYNAMIC] type is being updated with an invalid or bad BufferView
} DRAW_STATE_ERROR;
+typedef enum _SHADER_CHECKER_ERROR {
+ SHADER_CHECKER_NONE,
+ SHADER_CHECKER_FS_MIXED_BROADCAST, /* FS writes broadcast output AND custom outputs */
+ SHADER_CHECKER_INTERFACE_TYPE_MISMATCH, /* Type mismatch between shader stages or shader and pipeline */
+ SHADER_CHECKER_OUTPUT_NOT_CONSUMED, /* Entry appears in output interface, but missing in input */
+ SHADER_CHECKER_INPUT_NOT_PRODUCED, /* Entry appears in input interface, but missing in output */
+ SHADER_CHECKER_NON_SPIRV_SHADER, /* Shader image is not SPIR-V */
+ SHADER_CHECKER_INCONSISTENT_SPIRV, /* General inconsistency within a SPIR-V module */
+ SHADER_CHECKER_UNKNOWN_STAGE, /* Stage is not supported by analysis */
+ SHADER_CHECKER_INCONSISTENT_VI, /* VI state contains conflicting binding or attrib descriptions */
+ SHADER_CHECKER_MISSING_DESCRIPTOR, /* Shader attempts to use a descriptor binding not declared in the layout */
+} SHADER_CHECKER_ERROR;
+
typedef enum _DRAW_TYPE
{
DRAW = 0,
diff --git a/vk_layer_documentation_generate.py b/vk_layer_documentation_generate.py
index ccc0a8d..d56add9 100755
--- a/vk_layer_documentation_generate.py
+++ b/vk_layer_documentation_generate.py
@@ -57,14 +57,14 @@
'source' : 'layers/draw_state.cpp',
'generated' : False,
'error_enum' : 'DRAW_STATE_ERROR'},
+ 'shader_checker' : {'header' : 'layers/draw_state.h',
+ 'source' : 'layers/draw_state.cpp',
+ 'generated' : False,
+ 'error_enum' : 'SHADER_CHECKER_ERROR'},
'mem_tracker' : {'header' : 'layers/mem_tracker.h',
'source' : 'layers/mem_tracker.cpp',
'generated' : False,
'error_enum' : 'MEM_TRACK_ERROR'},
- 'shader_checker' : {'header' : 'layers/draw_state.h',
- 'source' : 'layers/draw_state.cpp',
- 'generated' : False,
- 'error_enum' : 'SHADER_CHECKER_ERROR'},
'threading' : {'header' : 'layers/threading.h',
'source' : 'dbuild/layers/threading.cpp',
'generated' : True,