From 2b3b1e8d09fa4aea2efa5ea4df1351da4f631e2d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 18 Mar 2018 15:40:37 -0400 Subject: [PATCH] VertexShaderGen: Convert defines to an enum Unlike defines, these will actually obey namespacing (should one be added), and also provide a symbol when debugging, as opposed to a magic value. --- Source/Core/VideoCommon/VertexShaderGen.h | 33 ++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Source/Core/VideoCommon/VertexShaderGen.h b/Source/Core/VideoCommon/VertexShaderGen.h index a93358d923..7d533c4061 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.h +++ b/Source/Core/VideoCommon/VertexShaderGen.h @@ -11,22 +11,25 @@ enum class APIType; // TODO should be reordered -#define SHADER_POSITION_ATTRIB 0 -#define SHADER_POSMTX_ATTRIB 1 -#define SHADER_NORM0_ATTRIB 2 -#define SHADER_NORM1_ATTRIB 3 -#define SHADER_NORM2_ATTRIB 4 -#define SHADER_COLOR0_ATTRIB 5 -#define SHADER_COLOR1_ATTRIB 6 +enum : int +{ + SHADER_POSITION_ATTRIB = 0, + SHADER_POSMTX_ATTRIB = 1, + SHADER_NORM0_ATTRIB = 2, + SHADER_NORM1_ATTRIB = 3, + SHADER_NORM2_ATTRIB = 4, + SHADER_COLOR0_ATTRIB = 5, + SHADER_COLOR1_ATTRIB = 6, -#define SHADER_TEXTURE0_ATTRIB 8 -#define SHADER_TEXTURE1_ATTRIB 9 -#define SHADER_TEXTURE2_ATTRIB 10 -#define SHADER_TEXTURE3_ATTRIB 11 -#define SHADER_TEXTURE4_ATTRIB 12 -#define SHADER_TEXTURE5_ATTRIB 13 -#define SHADER_TEXTURE6_ATTRIB 14 -#define SHADER_TEXTURE7_ATTRIB 15 + SHADER_TEXTURE0_ATTRIB = 8, + SHADER_TEXTURE1_ATTRIB = 9, + SHADER_TEXTURE2_ATTRIB = 10, + SHADER_TEXTURE3_ATTRIB = 11, + SHADER_TEXTURE4_ATTRIB = 12, + SHADER_TEXTURE5_ATTRIB = 13, + SHADER_TEXTURE6_ATTRIB = 14, + SHADER_TEXTURE7_ATTRIB = 15 +}; #pragma pack(1)