From 49c1285837a1ce1c506f0ae456f473745b26b44a Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 26 Jan 2016 19:11:59 -0800
Subject: [PATCH] Add suffix Mode to DebugMode enum to avoid collision

---
 .../render-utils/src/DebugDeferredBuffer.cpp  | 36 ++++++++++---------
 .../render-utils/src/DebugDeferredBuffer.h    | 25 ++++++-------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp
index 2dcfa35522..06d8709dc5 100644
--- a/libraries/render-utils/src/DebugDeferredBuffer.cpp
+++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp
@@ -30,15 +30,15 @@ using namespace render;
 void DebugDeferredBufferConfig::setMode(int newMode) {
     if (newMode == mode) {
         return;
-    } else if (newMode > (int)DebugDeferredBuffer::Custom || newMode < 0) {
-        mode = (int)DebugDeferredBuffer::Custom;
+    } else if (newMode > DebugDeferredBuffer::CustomMode || newMode < 0) {
+        mode = DebugDeferredBuffer::CustomMode;
     } else {
         mode = newMode;
     }
     emit dirty();
 }
 
-enum Slots {
+enum Slot {
     Diffuse = 0,
     Normal,
     Specular,
@@ -50,6 +50,8 @@ enum Slots {
     AmbientOcclusionBlurred
 };
 
+
+
 static const std::string DEFAULT_DIFFUSE_SHADER {
     "vec4 getFragmentColor() {"
     "    return vec4(pow(texture(diffuseMap, uv).xyz, vec3(1.0 / 2.2)), 1.0);"
@@ -142,27 +144,27 @@ DebugDeferredBuffer::DebugDeferredBuffer() {
 
 std::string DebugDeferredBuffer::getShaderSourceCode(Mode mode, std::string customFile) {
     switch (mode) {
-        case Diffuse:
+        case DiffuseMode:
             return DEFAULT_DIFFUSE_SHADER;
-        case Specular:
+        case SpecularMode:
             return DEFAULT_SPECULAR_SHADER;
-        case Roughness:
+        case RoughnessMode:
             return DEFAULT_ROUGHNESS_SHADER;
-        case Normal:
+        case NormalMode:
             return DEFAULT_NORMAL_SHADER;
-        case Depth:
+        case DepthMode:
             return DEFAULT_DEPTH_SHADER;
-        case Lighting:
+        case LightingMode:
             return DEFAULT_LIGHTING_SHADER;
-        case Shadow:
+        case ShadowMode:
             return DEFAULT_SHADOW_SHADER;
-        case PyramidDepth:
+        case PyramidDepthMode:
             return DEFAULT_PYRAMID_DEPTH_SHADER;
-        case AmbientOcclusion:
+        case AmbientOcclusionMode:
             return DEFAULT_AMBIENT_OCCLUSION_SHADER;
-        case AmbientOcclusionBlurred:
+        case AmbientOcclusionBlurredMode:
             return DEFAULT_AMBIENT_OCCLUSION_BLURRED_SHADER;
-        case Custom:
+        case CustomMode:
             return getFileContent(customFile, DEFAULT_CUSTOM_SHADER);
     }
     Q_UNREACHABLE();
@@ -170,7 +172,7 @@ std::string DebugDeferredBuffer::getShaderSourceCode(Mode mode, std::string cust
 }
 
 bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, std::string customFile) const {
-    if (mode != Custom) {
+    if (mode != CustomMode) {
         return !_pipelines[mode];
     }
     
@@ -218,14 +220,14 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str
         auto pipeline = gpu::Pipeline::create(program, std::make_shared<gpu::State>());
         
         // Good to go add the brand new pipeline
-        if (mode != Custom) {
+        if (mode != CustomMode) {
             _pipelines[mode] = pipeline;
         } else {
             _customPipelines[customFile].pipeline = pipeline;
         }
     }
     
-    if (mode != Custom) {
+    if (mode != CustomMode) {
         return _pipelines[mode];
     } else {
         return _customPipelines[customFile].pipeline;
diff --git a/libraries/render-utils/src/DebugDeferredBuffer.h b/libraries/render-utils/src/DebugDeferredBuffer.h
index 1cd199c67b..ecc2012466 100644
--- a/libraries/render-utils/src/DebugDeferredBuffer.h
+++ b/libraries/render-utils/src/DebugDeferredBuffer.h
@@ -46,17 +46,18 @@ protected:
     friend class DebugDeferredBufferConfig;
 
     enum Mode : uint8_t {
-        Diffuse = 0,
-        Specular,
-        Roughness,
-        Normal,
-        Depth,
-        Lighting,
-        Shadow,
-        PyramidDepth,
-        AmbientOcclusion,
-        AmbientOcclusionBlurred,
-        Custom // Needs to stay last
+        // Use Mode suffix to avoid collisions
+        DiffuseMode = 0,
+        SpecularMode,
+        RoughnessMode,
+        NormalMode,
+        DepthMode,
+        LightingMode,
+        ShadowMode,
+        PyramidDepthMode,
+        AmbientOcclusionMode,
+        AmbientOcclusionBlurredMode,
+        CustomMode // Needs to stay last
     };
 
 private:
@@ -67,7 +68,7 @@ private:
         gpu::PipelinePointer pipeline;
         mutable QFileInfo info;
     };
-    using StandardPipelines = std::array<gpu::PipelinePointer, Custom>;
+    using StandardPipelines = std::array<gpu::PipelinePointer, CustomMode>;
     using CustomPipelines = std::unordered_map<std::string, CustomPipeline>;
     
     bool pipelineNeedsUpdate(Mode mode, std::string customFile = std::string()) const;