Fixed defines tests in multisample.glsllib so that one can have a single sampled beck buffer and a multisampled depth buffer without having the shader to crash.

Also optimized the way glsl 150 texture vs texture2D is handled

jme3-core/src/main/resources/Common/ShaderLib/MultiSample.glsllib

@@ -15,8 +15,14 @@ uniform int m_NumSamplesDepth;
     #define DEPTHTEXTURE sampler2D
 #endif
 
-// NOTE: Only define multisample functions if multisample is available and is being used!
+#if __VERSION__ >= 150
-#if defined(GL_ARB_texture_multisample) && (defined(RESOLVE_MS) || defined(RESOLVE_DEPTH_MS))
+    #define TEXTURE texture
+#else
+    #define TEXTURE texture2D
+#endif
+
+// NOTE: Only define multisample functions if multisample is available
+#if defined(GL_ARB_texture_multisample)
 vec4 textureFetch(in sampler2DMS tex,in vec2 texC, in int numSamples){
       ivec2 iTexC = ivec2(texC * vec2(textureSize(tex)));
       vec4 color = vec4(0.0);
@@ -44,40 +50,21 @@ vec4 getDepth(in sampler2DMS tex,in vec2 texC){
       return textureFetch(tex,texC,m_NumSamplesDepth);
 }
 
-#elif __VERSION__ >= 150
+#endif
-
-vec4 fetchTextureSample(in sampler2D tex,in vec2 texC,in int sample){
-    return texture(tex,texC);
-}
-
-vec4 getColor(in sampler2D tex, in vec2 texC){
-    return texture(tex,texC);
-}
-
-vec4 getColorSingle(in sampler2D tex, in vec2 texC){
-    return texture(tex, texC);
-}
-
-vec4 getDepth(in sampler2D tex,in vec2 texC){
-    return texture(tex,texC);
-}
-
-#else
 
 vec4 fetchTextureSample(in sampler2D tex,in vec2 texC,in int sample){
-    return texture2D(tex,texC);
+    return TEXTURE(tex,texC);
 }
 
 vec4 getColor(in sampler2D tex, in vec2 texC){
-    return texture2D(tex,texC);
+    return TEXTURE(tex,texC);
 }
 
 vec4 getColorSingle(in sampler2D tex, in vec2 texC){
-    return texture2D(tex, texC);
+    return TEXTURE(tex, texC);
 }
 
 vec4 getDepth(in sampler2D tex,in vec2 texC){
-    return texture2D(tex,texC);
+    return TEXTURE(tex,texC);
 }
 
-#endif