Merge pull request #1 from jmecn/master

ATryder · web-flow · commit 4b5fd8f16211 · 2019-08-27T08:31:03.000-07:00
[M]Add GLSL150 to every .j3md. Add GLSLCompat to every .frag and .ver…
diff --git a/src/Common/MatDefs/TTF/Blur/HGaussianBlur.frag b/src/Common/MatDefs/TTF/Blur/HGaussianBlur.frag
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 #ifdef GL_ES
     precision mediump float;
 #endif
diff --git a/src/Common/MatDefs/TTF/Blur/HGaussianBlur.j3md b/src/Common/MatDefs/TTF/Blur/HGaussianBlur.j3md
@@ -7,8 +7,8 @@ MaterialDef HGaussianBlur {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Post/Post.vert
-        FragmentShader GLSL100: Common/MatDefs/TTF/Blur/HGaussianBlur.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Post/Post.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/Blur/HGaussianBlur.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/src/Common/MatDefs/TTF/Blur/VGaussianBlur.frag b/src/Common/MatDefs/TTF/Blur/VGaussianBlur.frag
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 #ifdef GL_ES
     precision mediump float;
 #endif
diff --git a/src/Common/MatDefs/TTF/Blur/VGaussianBlur.j3md b/src/Common/MatDefs/TTF/Blur/VGaussianBlur.j3md
@@ -7,8 +7,8 @@ MaterialDef VGaussianBlur {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Post/Post.vert
-        FragmentShader GLSL100: Common/MatDefs/TTF/Blur/VGaussianBlur.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Post/Post.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/Blur/VGaussianBlur.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/src/Common/MatDefs/TTF/Blur/blurFinal.frag b/src/Common/MatDefs/TTF/Blur/blurFinal.frag
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 #ifdef GL_ES
     precision mediump float;
 #endif
diff --git a/src/Common/MatDefs/TTF/Blur/blurFinal.j3md b/src/Common/MatDefs/TTF/Blur/blurFinal.j3md
@@ -6,8 +6,8 @@ MaterialDef blurFinal {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Post/Post.vert
-        FragmentShader GLSL100: Common/MatDefs/TTF/Blur/blurFinal.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Post/Post.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/Blur/blurFinal.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/src/Common/MatDefs/TTF/TTF.j3md b/src/Common/MatDefs/TTF/TTF.j3md
@@ -4,8 +4,8 @@ MaterialDef Simple {
         Boolean useAA : True
     }
     Technique {
-        VertexShader GLSL100: Common/MatDefs/TTF/TTF_Vert.vert
-        FragmentShader GLSL100: Common/MatDefs/TTF/TTF_Frag.frag
+        VertexShader GLSL100 GLSL150: Common/MatDefs/TTF/TTF_Vert.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/TTF_Frag.frag
         
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/src/Common/MatDefs/TTF/TTF_Bitmap.frag b/src/Common/MatDefs/TTF/TTF_Bitmap.frag
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 #ifdef GL_ES
     precision mediump float;
 #endif
diff --git a/src/Common/MatDefs/TTF/TTF_Bitmap.j3md b/src/Common/MatDefs/TTF/TTF_Bitmap.j3md
@@ -4,8 +4,8 @@ MaterialDef TrueTypeFont {
         Color Color (Color)
     }
     Technique {
-        VertexShader GLSL100: Common/MatDefs/TTF/TTF_Bitmap.vert
-        FragmentShader GLSL100: Common/MatDefs/TTF/TTF_Bitmap.frag
+        VertexShader GLSL100 GLSL150: Common/MatDefs/TTF/TTF_Bitmap.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/TTF_Bitmap.frag
         
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/src/Common/MatDefs/TTF/TTF_Bitmap.vert b/src/Common/MatDefs/TTF/TTF_Bitmap.vert
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 uniform mat4 g_WorldViewProjectionMatrix;
 attribute vec3 inPosition;
 attribute vec2 inTexCoord;
diff --git a/src/Common/MatDefs/TTF/TTF_BitmapOutlined.frag b/src/Common/MatDefs/TTF/TTF_BitmapOutlined.frag
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 #ifdef GL_ES
     precision mediump float;
 #endif
diff --git a/src/Common/MatDefs/TTF/TTF_BitmapOutlined.j3md b/src/Common/MatDefs/TTF/TTF_BitmapOutlined.j3md
@@ -5,8 +5,8 @@ MaterialDef TrueTypeOutlined {
         Color Outline (Color)
     }
     Technique {
-        VertexShader GLSL100: Common/MatDefs/TTF/TTF_Bitmap.vert
-        FragmentShader GLSL100: Common/MatDefs/TTF/TTF_BitmapOutlined.frag
+        VertexShader GLSL100 GLSL150: Common/MatDefs/TTF/TTF_Bitmap.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/TTF_BitmapOutlined.frag
         
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/src/Common/MatDefs/TTF/TTF_Frag.frag b/src/Common/MatDefs/TTF/TTF_Frag.frag
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 #ifdef USEAA
     #ifdef GL_ES
         #extension GL_OES_standard_derivatives:enable
diff --git a/src/Common/MatDefs/TTF/TTF_Vert.vert b/src/Common/MatDefs/TTF/TTF_Vert.vert
@@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 uniform mat4 g_WorldViewProjectionMatrix;
 attribute vec3 inPosition;
 attribute vec2 inTexCoord;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
	`2`	`+`
`1`	`3`	`#ifdef GL_ES`
`2`	`4`	`precision mediump float;`
`3`	`5`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ MaterialDef HGaussianBlur {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`Technique {`
`10`		`- VertexShader GLSL100: Common/MatDefs/Post/Post.vert`
`11`		`- FragmentShader GLSL100: Common/MatDefs/TTF/Blur/HGaussianBlur.frag`
	`10`	`+ VertexShader GLSL100 GLSL150: Common/MatDefs/Post/Post.vert`
	`11`	`+ FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/Blur/HGaussianBlur.frag`
`12`	`12`
`13`	`13`	`WorldParameters {`
`14`	`14`	`WorldViewProjectionMatrix`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ MaterialDef VGaussianBlur {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`Technique {`
`10`		`- VertexShader GLSL100: Common/MatDefs/Post/Post.vert`
`11`		`- FragmentShader GLSL100: Common/MatDefs/TTF/Blur/VGaussianBlur.frag`
	`10`	`+ VertexShader GLSL100 GLSL150: Common/MatDefs/Post/Post.vert`
	`11`	`+ FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/Blur/VGaussianBlur.frag`
`12`	`12`
`13`	`13`	`WorldParameters {`
`14`	`14`	`WorldViewProjectionMatrix`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ MaterialDef blurFinal {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`Technique {`
`9`		`- VertexShader GLSL100: Common/MatDefs/Post/Post.vert`
`10`		`- FragmentShader GLSL100: Common/MatDefs/TTF/Blur/blurFinal.frag`
	`9`	`+ VertexShader GLSL100 GLSL150: Common/MatDefs/Post/Post.vert`
	`10`	`+ FragmentShader GLSL100 GLSL150: Common/MatDefs/TTF/Blur/blurFinal.frag`
`11`	`11`
`12`	`12`	`WorldParameters {`
`13`	`13`	`WorldViewProjectionMatrix`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
	`2`	`+`
`1`	`3`	`uniform mat4 g_WorldViewProjectionMatrix;`
`2`	`4`	`attribute vec3 inPosition;`
`3`	`5`	`attribute vec2 inTexCoord;`