diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-14 18:01:17 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-17 15:32:11 -0600 |
| commit | 1e47e4b481b5a4a0891ad3e0db1683be49dfbdf2 (patch) | |
| tree | 28e0f9dd6e15f829261d7c1375a1b0228be74b7e /layers | |
| parent | e06f119d4e40f9a1be48457926fe1df342013da7 (diff) | |
| download | usermoji-1e47e4b481b5a4a0891ad3e0db1683be49dfbdf2.tar.xz | |
bug-14538: Remove validation error codes
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14538
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/param_checker.cpp | 23 | ||||
| -rw-r--r-- | layers/shader_checker.cpp | 2 |
2 files changed, 5 insertions, 20 deletions
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 74041192..c93f4875 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -185,9 +185,9 @@ std::string EnumeratorString(VkResult const& enumerator) return "VK_RESULT_MAX_ENUM"; break; } - case VK_ERROR_INVALID_LAYER: + case VK_ERROR_LAYER_NOT_PRESENT: { - return "VK_ERROR_INVALID_LAYER"; + return "VK_ERROR_LAYER_NOT_PRESENT"; break; } case VK_ERROR_INCOMPATIBLE_DRIVER: @@ -195,11 +195,6 @@ std::string EnumeratorString(VkResult const& enumerator) return "VK_ERROR_INCOMPATIBLE_DRIVER"; break; } - case VK_ERROR_MEMORY_UNMAP_FAILED: - { - return "VK_ERROR_MEMORY_UNMAP_FAILED"; - break; - } case VK_ERROR_MEMORY_MAP_FAILED: { return "VK_ERROR_MEMORY_MAP_FAILED"; @@ -215,11 +210,6 @@ std::string EnumeratorString(VkResult const& enumerator) return "VK_ERROR_OUT_OF_HOST_MEMORY"; break; } - case VK_ERROR_UNKNOWN: - { - return "VK_ERROR_UNKNOWN"; - break; - } case VK_ERROR_INITIALIZATION_FAILED: { return "VK_ERROR_INITIALIZATION_FAILED"; @@ -255,19 +245,14 @@ std::string EnumeratorString(VkResult const& enumerator) return "VK_UNSUPPORTED"; break; } - case VK_ERROR_INCOMPATIBLE_DEVICE: - { - return "VK_ERROR_INCOMPATIBLE_DEVICE"; - break; - } case VK_SUCCESS: { return "VK_SUCCESS"; break; } - case VK_ERROR_INVALID_EXTENSION: + case VK_ERROR_EXTENSION_NOT_PRESENT: { - return "VK_ERROR_INVALID_EXTENSION"; + return "VK_ERROR_EXTENSION_NOT_PRESENT"; break; } case VK_ERROR_DEVICE_LOST: diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index 632947ab..678b5671 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -976,7 +976,7 @@ vkCreateGraphicsPipelines(VkDevice device, return get_dispatch_table(shader_checker_device_table_map, device)->CreateGraphicsPipelines(device, pipelineCache, count, pCreateInfos, pPipelines); } else { - return VK_ERROR_UNKNOWN; + return VK_ERROR_VALIDATION_FAILED; } } |