diff --git a/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.frag b/jme3-niftygui/src/main/resources/Common/MatDefs/Nifty/NiftyQuad.frag index 31f49d6e5b..8ffbceca20 100644 --- 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 index bea82f0da0..73c71ac47d 100644 --- 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 index 1eb1616c29..2e23fd25b3 100644 --- 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 index 1f0a645e56..f9eb8baa0e 100644 --- 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 index 9412ba3808..ca351d8ea7 100644 --- 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 index e62b2b4cb1..c514a2c70f 100644 --- 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 index b2b4b95d6a..e333114c65 100644 --- 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 index 8d3b919981..e1d26494b8 100644 --- 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 index c5c3dc1b35..1a7f8499ba 100644 --- 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 index b0b594c624..d19d8aec99 100644 --- 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 index cf75cc5e46..e8ec3589b3 100644 --- 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 index 8260d8f72d..60f57f0782 100644 --- 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 index ac59e19cf3..426b665e94 100644 --- 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 index 78036c93cc..497f06b90c 100644 --- 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 index 7ae56cb4fd..ba7fac48f0 100644 --- 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 index 0f12dac703..98fe3eb9e7 100644 --- 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 index ddb40a9f4d..4ac2736bf4 100644 --- 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 index 9ce272fb73..f2ca013fc7 100644 --- 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 index 0d62d901fb..353ff4e627 100644 --- 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 index e03f03f7ff..04ddbe5a20 100644 --- 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 index 03a81aa322..9d61ca057e 100644 --- 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 index 080df41a1a..734a097e29 100644 --- 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 index f5d6e7da01..20d195c490 100644 --- 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 index b8627c0320..e0c17a91b1 100644 --- 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 index 09b4c9fb9c..c940462d8a 100644 --- 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"