big heckin reworkerino to use the standard #line directive as per spec

server/testdata/01/common.glsl

@@ -1,3 +0,0 @@
-float test() {
-	return 0.5;
-}

server/testdata/01/final.fsh

@@ -1,7 +0,0 @@
-#version 120
-
-#include "/common.glsl"
-
-void main() {
-	gl_FragColor[0] = vec4(0.0);
-}

server/testdata/01/final.fsh.merge

@@ -1,13 +0,0 @@
-#version 120
-#extension GL_GOOGLE_cpp_style_line_directive : enable
-#line 2 "!!"
-
-#line 1 "!!"
-float test() {
-	return 0.5;
-}
-#line 4 "!!"
-
-void main() {
-	gl_FragColor[0] = vec4(0.0);
-}

server/testdata/02/final.fsh

@@ -1,7 +0,0 @@
-#version 120
-
-#include "/utils/sample.glsl"
-
-void main() {
-	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
-}

server/testdata/02/final.fsh.merge

@@ -1,29 +0,0 @@
-#version 120
-#extension GL_GOOGLE_cpp_style_line_directive : enable
-#line 2 "!!"
-
-#line 1 "!!"
-int sample() {
-	return 5;
-}
-
-#line 1 "!!"
-void burger() {
-	// sample text
-}
-#line 6 "!!"
-
-#line 1 "!!"
-float test() {
-	return 3.0;
-}
-#line 8 "!!"
-
-int sample_more() {
-	return 5;
-}
-#line 4 "!!"
-
-void main() {
-	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
-}

server/testdata/02/utils/burger.glsl

@@ -1,3 +0,0 @@
-void burger() {
-	// sample text
-}

server/testdata/02/utils/sample.glsl

@@ -1,11 +0,0 @@
-int sample() {
-	return 5;
-}
-
-#include "/utils/burger.glsl"
-
-#include "/utils/test.glsl"
-
-int sample_more() {
-	return 5;
-}

server/testdata/02/utils/test.glsl

@@ -1,3 +0,0 @@
-float test() {
-	return 3.0;
-}

server/testdata/03/final.fsh

@@ -1,7 +0,0 @@
-#version 120
-
-#include "/utils/sample.glsl"
-
-void main() {
-	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
-}

server/testdata/03/final.fsh.merge

@@ -1,25 +0,0 @@
-#version 120
-#extension GL_GOOGLE_cpp_style_line_directive : enable
-#line 2 "!!"
-
-#line 1 "!!"
-int sample() {
-	return 5;
-}
-
-#line 1 "!!"
-void burger() {
-	// sample text
-}
-#line 6 "!!"
-
-#line 1 "!!"
-float test() {
-	return 3.0;
-}
-#line 8 "!!"
-#line 4 "!!"
-
-void main() {
-	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
-}

server/testdata/03/utils/burger.glsl

@@ -1,3 +0,0 @@
-void burger() {
-	// sample text
-}

server/testdata/03/utils/sample.glsl

@@ -1,7 +0,0 @@
-int sample() {
-	return 5;
-}
-
-#include "/utils/burger.glsl"
-
-#include "/utils/test.glsl"

server/testdata/03/utils/test.glsl

@@ -1,3 +0,0 @@
-float test() {
-	return 3.0;
-}

server/testdata/04/final.fsh

@@ -1,8 +0,0 @@
-#version 120
-
-#include "/utils/utilities.glsl"
-#include "/utils/matricies.glsl"
-
-void main() {
-	
-}

server/testdata/04/final.fsh.merge

@@ -1,25 +0,0 @@
-#version 120
-#extension GL_GOOGLE_cpp_style_line_directive : enable
-#line 2 "!!"
-
-#line 1 "!!"
-#line 1 "!!"
-void stuff1() {
-	
-}
-#line 2 "!!"
-#line 1 "!!"
-void stuff2() {
-	
-}
-#line 3 "!!"
-#line 4 "!!"
-#line 1 "!!"
-void matrix() {
-	
-}
-#line 5 "!!"
-
-void main() {
-	
-}

server/testdata/04/lib/matrices.glsl

@@ -1,3 +0,0 @@
-void matrix() {
-	
-}

server/testdata/04/utils/stuff1.glsl

@@ -1,3 +0,0 @@
-void stuff1() {
-	
-}

server/testdata/04/utils/stuff2.glsl

@@ -1,3 +0,0 @@
-void stuff2() {
-	
-}

server/testdata/04/utils/utilities.glsl

@@ -1,2 +0,0 @@
-#include "/utils/stuff1.glsl"
-#include "/utils/stuff2.glsl"

server/testdata/05/common.glsl

@@ -1,3 +0,0 @@
-float test() {
-	return 0.5;
-}

server/testdata/05/final.fsh

@@ -1,8 +0,0 @@
-#version 120
-
-#include "/common.glsl"
-#include "/test/banana.glsl"
-
-void main() {
-	gl_FragColor = vec4(0.0);
-}

server/testdata/05/final.fsh.merge

@@ -1,24 +0,0 @@
-#version 120
-#extension GL_GOOGLE_cpp_style_line_directive : enable
-#line 2 "!!"
-
-#line 1 "!!"
-float test() {
-	return 0.5;
-}
-#line 4 "!!"
-#line 1 "!!"
-#line 1 "!!"
-void dont() {
-
-}
-#line 2 "!!"
-
-void ok() {
-	
-}
-#line 5 "!!"
-
-void main() {
-	gl_FragColor = vec4(0.0);
-}

server/testdata/05/test/banana.glsl

@@ -1,5 +0,0 @@
-#include "burger.glsl"
-
-void ok() {
-	
-}

server/testdata/05/test/burger.glsl

@@ -1,3 +0,0 @@
-void dont() {
-
-}