From bb03d2f2ad9674e2ac52bdb930b64e222879208e Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sun, 13 Jan 2019 23:07:50 -0500
Subject: [PATCH] Removes redundant enumeration.

---
 .../xcshareddata/xcschemes/Clock Signal.xcscheme          | 2 +-
 Outputs/OpenGL/ScanTarget.cpp                             | 8 ++++----
 Outputs/OpenGL/ScanTarget.hpp                             | 5 ++---
 Outputs/OpenGL/ScanTargetGLSLFragments.cpp                | 5 ++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
index f9049689f..782b17c09 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
@@ -68,7 +68,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableASanStackUseAfterReturn = "YES"
diff --git a/Outputs/OpenGL/ScanTarget.cpp b/Outputs/OpenGL/ScanTarget.cpp
index ef3fb0f5c..45116ac4c 100644
--- a/Outputs/OpenGL/ScanTarget.cpp
+++ b/Outputs/OpenGL/ScanTarget.cpp
@@ -282,8 +282,8 @@ void ScanTarget::setup_pipeline() {
 	output_shader_ = conversion_shader(modals_.input_data_type, modals_.display_type, modals_.composite_colour_space);
 	glBindVertexArray(line_vertex_array_);
 	glBindBuffer(GL_ARRAY_BUFFER, line_buffer_name_);
-	enable_vertex_attributes(ShaderType::Line, *output_shader_);
-	set_uniforms(ShaderType::Line, *output_shader_);
+	enable_vertex_attributes(ShaderType::Conversion, *output_shader_);
+	set_uniforms(ShaderType::Conversion, *output_shader_);
 	output_shader_->set_uniform("origin", modals_.visible_area.origin.x, modals_.visible_area.origin.y);
 	output_shader_->set_uniform("size", modals_.visible_area.size.width, modals_.visible_area.size.height);
 	output_shader_->set_uniform("textureName", GLint(UnprocessedLineBufferTextureUnit - GL_TEXTURE0));
@@ -292,8 +292,8 @@ void ScanTarget::setup_pipeline() {
 	input_shader_ = composition_shader(modals_.input_data_type);
 	glBindVertexArray(scan_vertex_array_);
 	glBindBuffer(GL_ARRAY_BUFFER, scan_buffer_name_);
-	enable_vertex_attributes(ShaderType::InputScan, *input_shader_);
-	set_uniforms(ShaderType::InputScan, *input_shader_);
+	enable_vertex_attributes(ShaderType::Composition, *input_shader_);
+	set_uniforms(ShaderType::Composition, *input_shader_);
 	input_shader_->set_uniform("textureName", GLint(SourceDataTextureUnit - GL_TEXTURE0));
 }
 
diff --git a/Outputs/OpenGL/ScanTarget.hpp b/Outputs/OpenGL/ScanTarget.hpp
index 077adcf8a..59ac9c2d5 100644
--- a/Outputs/OpenGL/ScanTarget.hpp
+++ b/Outputs/OpenGL/ScanTarget.hpp
@@ -152,9 +152,8 @@ class ScanTarget: public Outputs::Display::ScanTarget {
 		void setup_pipeline();
 
 		enum class ShaderType {
-			InputScan,
-			ProcessedScan,
-			Line
+			Composition,
+			Conversion
 		};
 
 		/*!
diff --git a/Outputs/OpenGL/ScanTargetGLSLFragments.cpp b/Outputs/OpenGL/ScanTargetGLSLFragments.cpp
index b5004959b..cebc7eeb3 100644
--- a/Outputs/OpenGL/ScanTargetGLSLFragments.cpp
+++ b/Outputs/OpenGL/ScanTargetGLSLFragments.cpp
@@ -22,8 +22,7 @@ void Outputs::Display::OpenGL::ScanTarget::set_uniforms(ShaderType type, Shader
 
 void ScanTarget::enable_vertex_attributes(ShaderType type, Shader &target) {
 	switch(type) {
-		case ShaderType::InputScan:
-		case ShaderType::ProcessedScan:
+		case ShaderType::Composition:
 			for(int c = 0; c < 2; ++c) {
 				const std::string prefix = c ? "end" : "start";
 
@@ -57,7 +56,7 @@ void ScanTarget::enable_vertex_attributes(ShaderType type, Shader &target) {
 				1);
 		break;
 
-		case ShaderType::Line:
+		case ShaderType::Conversion:
 			for(int c = 0; c < 2; ++c) {
 				const std::string prefix = c ? "end" : "start";