Added a GLSL150 to most of the shaders used in the engine (except deprecated ones).

All shaders now import the GLSLCompat.glsllib

Author: Nehon

jme3-core/src/main/java/com/jme3/post/HDRRenderer.java

@@ -47,6 +47,10 @@
 import java.util.Collection;
 import java.util.logging.Logger;
 
+/**
+ * @deprecated use the ToneMappingFilter.
+ */
+@Deprecated
 public class HDRRenderer implements SceneProcessor {
 
     private static final int LUMMODE_NONE = 0x1,

jme3-core/src/main/resources/Common/MatDefs/Blur/HGaussianBlur.frag

@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform sampler2D m_Texture; // this should hold the texture rendered by the horizontal blur pass
 uniform float m_Size;
 uniform float m_Scale;

jme3-core/src/main/resources/Common/MatDefs/Blur/HGaussianBlur.j3md

@@ -1,4 +1,4 @@
-MaterialDef Bloom {
+MaterialDef HGaussianBlur {
 
     MaterialParameters {
         Int NumSamples
@@ -8,8 +8,8 @@ MaterialDef Bloom {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Post/Post.vert
-        FragmentShader GLSL100: Common/MatDefs/Blur/HGaussianBlur.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Post/Post.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Blur/HGaussianBlur.frag
 
         WorldParameters {
         }

jme3-core/src/main/resources/Common/MatDefs/Blur/RadialBlur.frag

@@ -1,7 +1,11 @@
-uniform sampler2D m_Texture;
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+#import "Common/ShaderLib/MultiSample.glsllib"
+
+uniform COLORTEXTURE m_Texture;
 uniform float m_SampleDist;
 uniform float m_SampleStrength;
 uniform float m_Samples[10];
+
 varying vec2 texCoord;
 
 void main(void)
@@ -22,15 +26,14 @@ void main(void)
 
     // this is the original colour of this fragment
     // using only this would result in a nonblurred version
-    vec4 colorRes = texture2D(m_Texture,texCoord);
+    vec4 colorRes = getColor(m_Texture,texCoord);
 
     vec4 sum = colorRes;
 
     // take 10 additional blur samples in the direction towards
     // the center of the screen
-    for (int i = 0; i < 10; i++)
-    {
-      sum += texture2D( m_Texture, texCoord + dir * m_Samples[i] * m_SampleDist );
+    for (int i = 0; i < 10; i++){
+      sum += getColor( m_Texture, texCoord + dir * m_Samples[i] * m_SampleDist );
     }
 
     // we have taken eleven samples
@@ -42,6 +45,6 @@ void main(void)
     t = clamp( t ,0.0,1.0); //0 &lt;= t &lt;= 1
 
     //Blend the original color with the averaged pixels
-    gl_FragColor =mix( colorRes, sum, t );
+    gl_FragColor = mix( colorRes, sum, t );
 
 }

jme3-core/src/main/resources/Common/MatDefs/Blur/RadialBlur.j3md

@@ -10,8 +10,8 @@ MaterialDef Radial Blur {
     }
 
     Technique {
-        VertexShader GLSL150:   Common/MatDefs/Post/Post15.vert
-        FragmentShader GLSL150: Common/MatDefs/Blur/RadialBlur15.frag
+        VertexShader GLSL120 GLSL150:   Common/MatDefs/Post/Post.vert
+        FragmentShader GLSL120 GLSL150: Common/MatDefs/Blur/RadialBlur.frag
 
         WorldParameters {
         }
@@ -20,12 +20,4 @@ MaterialDef Radial Blur {
             RESOLVE_MS : NumSamples
         }
     }
-
-    Technique {
-        VertexShader GLSL120:   Common/MatDefs/Post/Post.vert
-        FragmentShader GLSL120: Common/MatDefs/Blur/RadialBlur.frag
-
-        WorldParameters {
-        }
-    }
 }

jme3-core/src/main/resources/Common/MatDefs/Blur/RadialBlur15.frag

@@ -1,3 +1,4 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 uniform sampler2D m_Texture; // this should hold the texture rendered by the horizontal blur pass
 uniform float m_Size;
 uniform float m_Scale;

jme3-core/src/main/resources/Common/MatDefs/Blur/VGaussianBlur.frag

@@ -1,4 +1,4 @@
-MaterialDef Bloom {
+MaterialDef VGaussianBlur {
 
     MaterialParameters {
         Int NumSamples
@@ -8,8 +8,8 @@ MaterialDef Bloom {
     }
 
     Technique {
-        VertexShader GLSL100:   Common/MatDefs/Post/Post.vert
-        FragmentShader GLSL100: Common/MatDefs/Blur/VGaussianBlur.frag
+        VertexShader GLSL100 GLSL150:   Common/MatDefs/Post/Post.vert
+        FragmentShader GLSL100 GLSL150: Common/MatDefs/Blur/VGaussianBlur.frag
 
         WorldParameters {
         }

jme3-core/src/main/resources/Common/MatDefs/Blur/VGaussianBlur.j3md

@@ -1,3 +1,4 @@
+//Don't use this
 MaterialDef Phong Lighting Deferred {
 
     MaterialParameters {

jme3-core/src/main/resources/Common/MatDefs/Light/Deferred.j3md

@@ -1,4 +1,4 @@
-
+#import "Common/ShaderLib/GLSLCompat.glsllib"
 #if defined(NEED_TEXCOORD1) 
     varying vec2 texCoord1;
 #else