solve issue #1780 (built-in matdefs/shaders lack core-profile support) (#1781)

stephengold · stephengold · commit 28bf1c977a83 · 2022-03-17T23:54:13.000-07:00
* jme3-terrain:  add GLSLCompat.glsllib to 4 jme3-terrain frag shaders

* jme3-terrain:  add GLSLCompat.glsllib to 4 jme3-terrain vertex shaders

* jme3-terrain:  add GLSL150 to 3 jme3-terrain material definitions

* jme3-vr:  add GLSLCompat.glsllib to 5 shaders

* jme3-niftygui:  add GLSLCompat.glsllib to 6 shaders

* jme3-niftygui:  add GLSL150 to 3 material definitions
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.frag b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform vec4 m_Color;
 
 void main() { 
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.j3md b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.j3md
@@ -5,8 +5,8 @@ MaterialDef Default GUI {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Nifty/NiftyQuad.vert
-        FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyQuad.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Nifty/NiftyQuad.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyQuad.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.vert b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform mat4 g_WorldViewProjectionMatrix;
 
 attribute vec4 inPosition;
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuadGrad.frag b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuadGrad.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 varying vec4 color;
 
 void main() { 
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuadGrad.j3md b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuadGrad.j3md
@@ -4,8 +4,8 @@ MaterialDef Default GUI {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Nifty/NiftyQuadGrad.vert
-        FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyQuadGrad.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Nifty/NiftyQuadGrad.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyQuadGrad.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuadGrad.vert b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuadGrad.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform mat4 g_WorldViewProjectionMatrix;
 
 attribute vec4 inPosition;
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyTex.frag b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyTex.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform sampler2D m_Texture;
 uniform vec4 m_Color; 
 
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyTex.j3md b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyTex.j3md
@@ -6,8 +6,8 @@ MaterialDef Default GUI {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Nifty/NiftyTex.vert
-        FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyTex.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Nifty/NiftyTex.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyTex.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyTex.vert b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyTex.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform mat4 g_WorldViewProjectionMatrix;
 
 attribute vec4 inPosition;
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/HeightBasedTerrain.frag b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/HeightBasedTerrain.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform vec3 m_region1;
 uniform vec3 m_region2;
 uniform vec3 m_region3;
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/HeightBasedTerrain.j3md b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/HeightBasedTerrain.j3md
@@ -25,8 +25,8 @@ MaterialDef Terrain {
 	}
 
 	Technique {
-		VertexShader GLSL100:   Common/MatDefs/Terrain/HeightBasedTerrain.vert
-		FragmentShader GLSL100: Common/MatDefs/Terrain/HeightBasedTerrain.frag
+		VertexShader GLSL100 GLSL150:   Common/MatDefs/Terrain/HeightBasedTerrain.vert
+		FragmentShader GLSL100 GLSL150: Common/MatDefs/Terrain/HeightBasedTerrain.frag
 
 		WorldParameters {
 			WorldViewProjectionMatrix
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/HeightBasedTerrain.vert b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/HeightBasedTerrain.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform float m_tilingFactor;
 uniform mat4 g_WorldViewProjectionMatrix;
 uniform mat4 g_WorldMatrix;
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/SPTerrainLighting.frag b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/SPTerrainLighting.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 #import "Common/ShaderLib/BlinnPhongLighting.glsllib"
 #import "Common/ShaderLib/Lighting.glsllib"
 
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/SPTerrainLighting.vert b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/SPTerrainLighting.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform mat4 g_WorldViewProjectionMatrix;
 uniform mat4 g_WorldViewMatrix;
 uniform mat3 g_NormalMatrix;
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Terrain.frag b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Terrain.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform sampler2D m_Alpha;
 uniform sampler2D m_Tex1;
 uniform sampler2D m_Tex2;
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Terrain.j3md b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Terrain.j3md
@@ -15,8 +15,8 @@ MaterialDef Terrain {
 	}
 
 	Technique {
-		VertexShader GLSL100:   Common/MatDefs/Terrain/Terrain.vert
-		FragmentShader GLSL100: Common/MatDefs/Terrain/Terrain.frag
+		VertexShader GLSL100 GLSL150:   Common/MatDefs/Terrain/Terrain.vert
+		FragmentShader GLSL100 GLSL150: Common/MatDefs/Terrain/Terrain.frag
 		
 		WorldParameters {
 			WorldViewProjectionMatrix
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Terrain.vert b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/Terrain.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform mat4 g_WorldViewProjectionMatrix;
 
 attribute vec3 inPosition;
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/TerrainLighting.frag b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/TerrainLighting.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 #import "Common/ShaderLib/BlinnPhongLighting.glsllib"
 #import "Common/ShaderLib/Lighting.glsllib"
 
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/TerrainLighting.j3md b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/TerrainLighting.j3md
@@ -108,8 +108,8 @@ MaterialDef Terrain Lighting {
 
         LightMode MultiPass
 
-        VertexShader GLSL100:   Common/MatDefs/Terrain/TerrainLighting.vert
-        FragmentShader GLSL100: Common/MatDefs/Terrain/TerrainLighting.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Terrain/TerrainLighting.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Terrain/TerrainLighting.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
@@ -173,8 +173,8 @@ MaterialDef Terrain Lighting {
 
         LightMode SinglePass
 
-        VertexShader GLSL100:   Common/MatDefs/Terrain/SPTerrainLighting.vert
-        FragmentShader GLSL100: Common/MatDefs/Terrain/SPTerrainLighting.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Terrain/SPTerrainLighting.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Terrain/SPTerrainLighting.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
@@ -236,8 +236,8 @@ MaterialDef Terrain Lighting {
 
     Technique PreShadow {
 
-        VertexShader GLSL100 :   Common/MatDefs/Shadow/PreShadow.vert
-        FragmentShader GLSL100 : Common/MatDefs/Shadow/PreShadow.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Shadow/PreShadow.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Shadow/PreShadow.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
@@ -260,8 +260,8 @@ MaterialDef Terrain Lighting {
 
   Technique PreNormalPass {
 
-        VertexShader GLSL100 :   Common/MatDefs/SSAO/normal.vert
-        FragmentShader GLSL100 : Common/MatDefs/SSAO/normal.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/SSAO/normal.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/SSAO/normal.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
@@ -283,8 +283,8 @@ MaterialDef Terrain Lighting {
 
     Technique Glow {
 
-        VertexShader GLSL100:   Common/MatDefs/Misc/Unshaded.vert
-        FragmentShader GLSL100: Common/MatDefs/Light/Glow.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Misc/Unshaded.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Light/Glow.frag
 
         WorldParameters {
             WorldViewProjectionMatrix
diff --git a/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/TerrainLighting.vert b/jme3-terrain/src/main/resources/Common/MatDefs/Terrain/TerrainLighting.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 #import "Common/ShaderLib/Lighting.glsllib"
 
 uniform mat4 g_WorldViewProjectionMatrix;
diff --git a/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR.frag b/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform sampler2D m_Texture;
 
 varying vec2 UVred;
diff --git a/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR.vert b/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 attribute vec4 inPosition;
 
 attribute vec2 inTexCoord;   // m_inUVred
diff --git a/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR15.frag b/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR15.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform sampler2D m_Texture;
 
 in vec2 UVred;
diff --git a/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR15.vert b/jme3-vr/src/main/resources/Common/MatDefs/VR/OpenVR15.vert
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 in vec4 inPosition;
 
 in vec2 inTexCoord;   // m_inUVred
diff --git a/jme3-vr/src/main/resources/Common/MatDefs/VR/PostShadowFilter.frag b/jme3-vr/src/main/resources/Common/MatDefs/VR/PostShadowFilter.frag
@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 #import "Common/ShaderLib/MultiSample.glsllib"
 #import "Common/ShaderLib/Shadows.glsllib"
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
`1`	`2`	`uniform vec4 m_Color;`
`2`	`3`
`3`	`4`	`void main() {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ MaterialDef Default GUI {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`Technique {`
`8`		`- VertexShader GLSL100: Common/MatDefs/Nifty/NiftyQuad.vert`
`9`		`- FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyQuad.frag`
	`8`	`+ VertexShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyQuad.vert`
	`9`	`+ FragmentShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyQuad.frag`
`10`	`10`
`11`	`11`	`WorldParameters {`
`12`	`12`	`WorldViewProjectionMatrix`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
`1`	`2`	`uniform mat4 g_WorldViewProjectionMatrix;`
`2`	`3`
`3`	`4`	`attribute vec4 inPosition;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
`1`	`2`	`varying vec4 color;`
`2`	`3`
`3`	`4`	`void main() {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ MaterialDef Default GUI {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`Technique {`
`7`		`- VertexShader GLSL100: Common/MatDefs/Nifty/NiftyQuadGrad.vert`
`8`		`- FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyQuadGrad.frag`
	`7`	`+ VertexShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyQuadGrad.vert`
	`8`	`+ FragmentShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyQuadGrad.frag`
`9`	`9`
`10`	`10`	`WorldParameters {`
`11`	`11`	`WorldViewProjectionMatrix`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
`1`	`2`	`uniform sampler2D m_Texture;`
`2`	`3`	`uniform vec4 m_Color;`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ MaterialDef Default GUI {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`Technique {`
`9`		`- VertexShader GLSL100: Common/MatDefs/Nifty/NiftyTex.vert`
`10`		`- FragmentShader GLSL100: Common/MatDefs/Nifty/NiftyTex.frag`
	`9`	`+ VertexShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyTex.vert`
	`10`	`+ FragmentShader GLSL100 GLSL150: Common/MatDefs/Nifty/NiftyTex.frag`
`11`	`11`
`12`	`12`	`WorldParameters {`
`13`	`13`	`WorldViewProjectionMatrix`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
`1`	`2`	`uniform vec3 m_region1;`
`2`	`3`	`uniform vec3 m_region2;`
`3`	`4`	`uniform vec3 m_region3;`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ MaterialDef Terrain {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`Technique {`
`28`		`- VertexShader GLSL100: Common/MatDefs/Terrain/HeightBasedTerrain.vert`
`29`		`- FragmentShader GLSL100: Common/MatDefs/Terrain/HeightBasedTerrain.frag`
	`28`	`+ VertexShader GLSL100 GLSL150: Common/MatDefs/Terrain/HeightBasedTerrain.vert`
	`29`	`+ FragmentShader GLSL100 GLSL150: Common/MatDefs/Terrain/HeightBasedTerrain.frag`
`30`	`30`
`31`	`31`	`WorldParameters {`
`32`	`32`	`WorldViewProjectionMatrix`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#import "Common/ShaderLib/GLSLCompat.glsllib"`
`1`	`2`	`uniform float m_tilingFactor;`
`2`	`3`	`uniform mat4 g_WorldViewProjectionMatrix;`
`3`	`4`	`uniform mat4 g_WorldMatrix;`