diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2015-12-04 10:11:56 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-12-07 14:36:49 -0700 |
| commit | 50efb9756935a84d223ba8c0cf32c08ef38f9b27 (patch) | |
| tree | 6a124ea8d71396ecea4c5118e82b2e87230f1fd9 /layers | |
| parent | 56cec869e4efcd3e9e6f3632efc577d83bf6c28e (diff) | |
| download | usermoji-50efb9756935a84d223ba8c0cf32c08ef38f9b27.tar.xz | |
layers: Wrap up windows/test issues with DrawState/ShaderChecker merge
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | layers/draw_state.h | 28 |
2 files changed, 13 insertions, 16 deletions
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 63a79dc1..905861ff 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -25,7 +25,6 @@ set(LAYER_JSON_FILES object_tracker param_checker screenshot - shader_checker swapchain threading device_limits diff --git a/layers/draw_state.h b/layers/draw_state.h index c430419a..33d4828e 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 @@ typedef enum _DRAW_STATE_ERROR 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, |