From 748da31049cebfb6fd6195c5e1acd7613be40502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Fri, 31 Oct 2014 21:54:35 -0700
Subject: [PATCH] Skip white space between $input/$output.

---
 .../glsl-optimizer/src/glsl/ir_print_metal_visitor.cpp    | 4 ++--
 3rdparty/glsl-optimizer/src/mesa/main/compiler.h          | 8 ++++++++
 tools/shaderc/shaderc.cpp                                 | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/3rdparty/glsl-optimizer/src/glsl/ir_print_metal_visitor.cpp b/3rdparty/glsl-optimizer/src/glsl/ir_print_metal_visitor.cpp
index 28b3046d6..ebef625be 100644
--- a/3rdparty/glsl-optimizer/src/glsl/ir_print_metal_visitor.cpp
+++ b/3rdparty/glsl-optimizer/src/glsl/ir_print_metal_visitor.cpp
@@ -374,7 +374,7 @@ void ir_print_metal_visitor::newline_deindent()
 
 void ir_print_metal_visitor::print_var_name (ir_variable* v)
 {
-    long id = (long)hash_table_find (globals->var_hash, v);
+    uintptr_t id = (uintptr_t)hash_table_find (globals->var_hash, v);
 	if (!id && v->data.mode == ir_var_temporary)
 	{
         id = ++globals->var_counter;
@@ -543,7 +543,7 @@ void ir_print_metal_visitor::visit(ir_variable *ir)
 	// give an id to any variable defined in a function that is not an uniform
 	if ((this->mode == kPrintGlslNone && ir->data.mode != ir_var_uniform))
 	{
-		long id = (long)hash_table_find (globals->var_hash, ir);
+		uintptr_t id = (uintptr_t)hash_table_find (globals->var_hash, ir);
 		if (id == 0)
 		{
 			id = ++globals->var_counter;
diff --git a/3rdparty/glsl-optimizer/src/mesa/main/compiler.h b/3rdparty/glsl-optimizer/src/mesa/main/compiler.h
index 34671dc7e..d289cd400 100644
--- a/3rdparty/glsl-optimizer/src/mesa/main/compiler.h
+++ b/3rdparty/glsl-optimizer/src/mesa/main/compiler.h
@@ -247,6 +247,14 @@ static inline GLuint CPU_TO_LE32(GLuint x)
 #define M_PI (3.14159265358979323846)
 #endif
 
+#ifndef M_PI_2
+#define M_PI_2 1.57079632679489661923
+#endif
+
+#ifndef M_PI_4
+#define M_PI_4 0.78539816339744830962
+#endif
+
 #ifndef M_E
 #define M_E (2.7182818284590452354)
 #endif
diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp
index 1e0da962d..87f4c2021 100644
--- a/tools/shaderc/shaderc.cpp
+++ b/tools/shaderc/shaderc.cpp
@@ -2032,6 +2032,8 @@ int main(int _argc, const char* _argv[])
 					raw = true;
 					str += 3;
 				}
+
+				input = const_cast<char*>(bx::strws(input) );
 			}
 
 			if (!raw)