- moved EColorManipulation into the backend.

src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp

@@ -28,7 +28,6 @@
 #include "texturemanager.h"
 #include "templates.h"
 #include "stats.h"
-#include "colormaps.h"
 
 Postprocess hw_postprocess;
 

src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp

@@ -28,7 +28,6 @@
 #include "v_text.h"
 #include "i_video.h"
 #include "v_draw.h"
-#include "colormaps.h"
 
 #include "hw_clock.h"
 #include "hw_vrmodes.h"

src/common/utility/palutil.h

@@ -63,3 +63,13 @@ int AddSpecialColormap(PalEntry *pe, float r1, float g1, float b1, float r2, flo
 void InitSpecialColormaps(PalEntry* pe);
 void UpdateSpecialColormap(PalEntry* BaseColors, unsigned int index, float r1, float g1, float b1, float r2, float g2, float b2);
 int ReadPalette(int lumpnum, uint8_t* buffer);
+
+enum EColorManipulation
+{
+	CM_PLAIN2D = -2,			// regular 2D drawing.
+	CM_INVALID = -1,
+	CM_DEFAULT = 0,					// untranslated
+	CM_FIRSTSPECIALCOLORMAP,		// first special fixed colormap
+};
+
+#define CM_MAXCOLORMAP int(CM_FIRSTSPECIALCOLORMAP + SpecialColormaps.Size())

src/r_data/colormaps.h

@@ -43,13 +43,4 @@ inline uint32_t MakeSpecialColormap(int index)
 	return index | SPECIALCOLORMAP_MASK;
 }
 
-enum EColorManipulation
-{
-	CM_DEFAULT = 0,					// untranslated
-	CM_FIRSTSPECIALCOLORMAP,		// first special fixed colormap
-};
-
-#define CM_MAXCOLORMAP int(CM_FIRSTSPECIALCOLORMAP + SpecialColormaps.Size())
-
-
 #endif