From a021284d259abc689f290ae768894595a26270d0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 4 Oct 2015 00:41:02 +0200 Subject: [PATCH] Shorten some string representations of states for pipeline view --- renderdoc/driver/vulkan/vk_common.cpp | 112 +++++++++++++------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp index 275982584..f9418a40a 100644 --- a/renderdoc/driver/vulkan/vk_common.cpp +++ b/renderdoc/driver/vulkan/vk_common.cpp @@ -1149,25 +1149,25 @@ string ToStrHelper::Get(const VkBlend &el) { switch(el) { - TOSTR_CASE_STRINGIZE(VK_BLEND_ZERO) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE) - TOSTR_CASE_STRINGIZE(VK_BLEND_SRC_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_SRC_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_DEST_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_DEST_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_SRC_ALPHA) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_SRC_ALPHA) - TOSTR_CASE_STRINGIZE(VK_BLEND_DEST_ALPHA) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_DEST_ALPHA) - TOSTR_CASE_STRINGIZE(VK_BLEND_CONSTANT_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_CONSTANT_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_CONSTANT_ALPHA) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_CONSTANT_ALPHA) - TOSTR_CASE_STRINGIZE(VK_BLEND_SRC_ALPHA_SATURATE) - TOSTR_CASE_STRINGIZE(VK_BLEND_SRC1_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_SRC1_COLOR) - TOSTR_CASE_STRINGIZE(VK_BLEND_SRC1_ALPHA) - TOSTR_CASE_STRINGIZE(VK_BLEND_ONE_MINUS_SRC1_ALPHA) + case VK_BLEND_ZERO: return "ZERO"; + case VK_BLEND_ONE: return "ONE"; + case VK_BLEND_SRC_COLOR: return "SRC_COLOR"; + case VK_BLEND_ONE_MINUS_SRC_COLOR: return "INV_SRC_COLOR"; + case VK_BLEND_DEST_COLOR: return "DEST_COLOR"; + case VK_BLEND_ONE_MINUS_DEST_COLOR: return "INV_DEST_COLOR"; + case VK_BLEND_SRC_ALPHA: return "SRC_ALPHA"; + case VK_BLEND_ONE_MINUS_SRC_ALPHA: return "INV_SRC_ALPHA"; + case VK_BLEND_DEST_ALPHA: return "DEST_ALPHA"; + case VK_BLEND_ONE_MINUS_DEST_ALPHA: return "INV_DEST_ALPHA"; + case VK_BLEND_CONSTANT_COLOR: return "CONST_COLOR"; + case VK_BLEND_ONE_MINUS_CONSTANT_COLOR: return "INV_CONST_COLOR"; + case VK_BLEND_CONSTANT_ALPHA: return "CONST_ALPHA"; + case VK_BLEND_ONE_MINUS_CONSTANT_ALPHA: return "INV_CONST_ALPHA"; + case VK_BLEND_SRC_ALPHA_SATURATE: return "SRC_ALPHA_SAT"; + case VK_BLEND_SRC1_COLOR: return "SRC1_COLOR"; + case VK_BLEND_ONE_MINUS_SRC1_COLOR: return "INV_SRC1_COLOR"; + case VK_BLEND_SRC1_ALPHA: return "SRC1_ALPHA"; + case VK_BLEND_ONE_MINUS_SRC1_ALPHA: return "INV_SRC1_ALPHA"; default: break; } @@ -1206,11 +1206,11 @@ string ToStrHelper::Get(const VkBlendOp &el) { switch(el) { - TOSTR_CASE_STRINGIZE(VK_BLEND_OP_ADD) - TOSTR_CASE_STRINGIZE(VK_BLEND_OP_SUBTRACT) - TOSTR_CASE_STRINGIZE(VK_BLEND_OP_REVERSE_SUBTRACT) - TOSTR_CASE_STRINGIZE(VK_BLEND_OP_MIN) - TOSTR_CASE_STRINGIZE(VK_BLEND_OP_MAX) + case VK_BLEND_OP_ADD: return "ADD"; + case VK_BLEND_OP_SUBTRACT: return "SUB"; + case VK_BLEND_OP_REVERSE_SUBTRACT: return "REV_SUB"; + case VK_BLEND_OP_MIN: return "MIN"; + case VK_BLEND_OP_MAX: return "MAX"; default: break; } @@ -1222,14 +1222,14 @@ string ToStrHelper::Get(const VkStencilOp &el) { switch(el) { - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_KEEP) - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_ZERO) - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_REPLACE) - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_INC_CLAMP) - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_DEC_CLAMP) - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_INVERT) - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_INC_WRAP) - TOSTR_CASE_STRINGIZE(VK_STENCIL_OP_DEC_WRAP) + case VK_STENCIL_OP_KEEP: return "KEEP"; + case VK_STENCIL_OP_ZERO: return "ZERO"; + case VK_STENCIL_OP_REPLACE: return "REPLACE"; + case VK_STENCIL_OP_INC_CLAMP: return "INC_SAT"; + case VK_STENCIL_OP_DEC_CLAMP: return "DEC_SAT"; + case VK_STENCIL_OP_INVERT: return "INVERT"; + case VK_STENCIL_OP_INC_WRAP: return "INC_WRAP"; + case VK_STENCIL_OP_DEC_WRAP: return "DEC_WRAP"; default: break; } @@ -1241,22 +1241,22 @@ string ToStrHelper::Get(const VkLogicOp &el) { switch(el) { - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_COPY) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_CLEAR) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_AND) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_AND_REVERSE) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_AND_INVERTED) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_NOOP) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_XOR) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_OR) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_NOR) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_EQUIV) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_INVERT) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_OR_REVERSE) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_COPY_INVERTED) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_OR_INVERTED) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_NAND) - TOSTR_CASE_STRINGIZE(VK_LOGIC_OP_SET) + case VK_LOGIC_OP_COPY: return "COPY"; + case VK_LOGIC_OP_CLEAR: return "CLEAR"; + case VK_LOGIC_OP_AND: return "AND"; + case VK_LOGIC_OP_AND_REVERSE: return "AND_REV"; + case VK_LOGIC_OP_AND_INVERTED: return "AND_INV"; + case VK_LOGIC_OP_NOOP: return "NOOP"; + case VK_LOGIC_OP_XOR: return "XOR"; + case VK_LOGIC_OP_OR: return "OR"; + case VK_LOGIC_OP_NOR: return "NOR"; + case VK_LOGIC_OP_EQUIV: return "EQUIV"; + case VK_LOGIC_OP_INVERT: return "INVERT"; + case VK_LOGIC_OP_OR_REVERSE: return "OR_REV"; + case VK_LOGIC_OP_COPY_INVERTED: return "COPY_INV"; + case VK_LOGIC_OP_OR_INVERTED: return "OR_INV"; + case VK_LOGIC_OP_NAND: return "NAND"; + case VK_LOGIC_OP_SET: return "SET"; default: break; } @@ -1268,14 +1268,14 @@ string ToStrHelper::Get(const VkCompareOp &el) { switch(el) { - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_NEVER) - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_LESS) - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_EQUAL) - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_LESS_EQUAL) - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_GREATER) - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_NOT_EQUAL) - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_GREATER_EQUAL) - TOSTR_CASE_STRINGIZE(VK_COMPARE_OP_ALWAYS) + case VK_COMPARE_OP_NEVER: return "NEVER"; + case VK_COMPARE_OP_LESS: return "LESS"; + case VK_COMPARE_OP_EQUAL: return "EQUAL"; + case VK_COMPARE_OP_LESS_EQUAL: return "LESS_EQUAL"; + case VK_COMPARE_OP_GREATER: return "GREATER"; + case VK_COMPARE_OP_NOT_EQUAL: return "NOT_EQUAL"; + case VK_COMPARE_OP_GREATER_EQUAL: return "GREATER_EQUAL"; + case VK_COMPARE_OP_ALWAYS: return "ALWAYS"; default: break; }