summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-09-01 12:18:13 -0400
committerLioncash <mathew1800@gmail.com>2015-09-01 12:18:18 -0400
commit91eff28699544eac79bc9dce69f6430a8fa4f1e9 (patch)
tree10a13dd7b1d5cbd33ec06ba67eaa7341cd189989 /Source
parentc760ffbd285cff590891c1bf10b78e90390863f7 (diff)
PixelShaderGen: Move defines into the implementation file
These aren't used outside of it. This also reduces the amount of things in the global namespace.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/VideoCommon/PixelShaderGen.cpp18
-rw-r--r--Source/Core/VideoCommon/PixelShaderGen.h17
2 files changed, 18 insertions, 17 deletions
diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp
index 36a3567f10..b46a90eaf8 100644
--- a/Source/Core/VideoCommon/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/PixelShaderGen.cpp
@@ -18,6 +18,24 @@
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/XFMemory.h" // for texture projection mode
+// TODO: Get rid of these
+enum : u32
+{
+ C_COLORMATRIX = 0, // 0
+ C_COLORS = 0, // 0
+ C_KCOLORS = C_COLORS + 4, // 4
+ C_ALPHA = C_KCOLORS + 4, // 8
+ C_TEXDIMS = C_ALPHA + 1, // 9
+ C_ZBIAS = C_TEXDIMS + 8, // 17
+ C_INDTEXSCALE = C_ZBIAS + 2, // 19
+ C_INDTEXMTX = C_INDTEXSCALE + 2, // 21
+ C_FOGCOLOR = C_INDTEXMTX + 6, // 27
+ C_FOGI = C_FOGCOLOR + 1, // 28
+ C_FOGF = C_FOGI + 1, // 29
+ C_ZSLOPE = C_FOGF + 2, // 31
+ C_EFBSCALE = C_ZSLOPE + 1, // 32
+ C_PENVCONST_END = C_EFBSCALE + 1
+};
static const char *tevKSelTableC[] =
{
diff --git a/Source/Core/VideoCommon/PixelShaderGen.h b/Source/Core/VideoCommon/PixelShaderGen.h
index 5a871fce6d..90241e867d 100644
--- a/Source/Core/VideoCommon/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/PixelShaderGen.h
@@ -9,23 +9,6 @@
#include "VideoCommon/ShaderGenCommon.h"
#include "VideoCommon/VideoCommon.h"
-// TODO: get rid of them as they aren't used
-#define C_COLORMATRIX 0 // 0
-#define C_COLORS 0 // 0
-#define C_KCOLORS (C_COLORS + 4) // 4
-#define C_ALPHA (C_KCOLORS + 4) // 8
-#define C_TEXDIMS (C_ALPHA + 1) // 9
-#define C_ZBIAS (C_TEXDIMS + 8) //17
-#define C_INDTEXSCALE (C_ZBIAS + 2) //19
-#define C_INDTEXMTX (C_INDTEXSCALE + 2) //21
-#define C_FOGCOLOR (C_INDTEXMTX + 6) //27
-#define C_FOGI (C_FOGCOLOR + 1) //28
-#define C_FOGF (C_FOGI + 1) //29
-#define C_ZSLOPE (C_FOGF + 2) //31
-#define C_EFBSCALE (C_ZSLOPE + 1) //32
-
-#define C_PENVCONST_END (C_EFBSCALE + 1)
-
// Different ways to achieve rendering with destination alpha
enum DSTALPHA_MODE
{