Merge pull request #377 from davidB/fix_opengl3

opengl3: add GLSLCompat into Gui.j3md
9 years ago · 79638b7434
parent 69297af414 2938acec51
commit 79638b7434
3 changed files with 17 additions and 2 deletions
--- a/jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.frag
+++ b/jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.frag
@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 #ifdef TEXTURE
    uniform sampler2D m_Texture;
    varying vec2 texCoord;
--- a/jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.j3md
+++ b/jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.j3md
@ -7,8 +7,8 @@ MaterialDef Default GUI {
    }

    Technique {
-        VertexShader GLSL100:   Common/MatDefs/Gui/Gui.vert
-        FragmentShader GLSL100: Common/MatDefs/Gui/Gui.frag
+        VertexShader GLSL150:   Common/MatDefs/Gui/Gui.vert
+        FragmentShader GLSL150: Common/MatDefs/Gui/Gui.frag

        WorldParameters {
            WorldViewProjectionMatrix
@ -21,6 +21,17 @@ MaterialDef Default GUI {
    }

    Technique {
+        VertexShader GLSL100:   Common/MatDefs/Gui/Gui.vert
+        FragmentShader GLSL100: Common/MatDefs/Gui/Gui.frag
+
+        WorldParameters {
+            WorldViewProjectionMatrix
+        }
+
+        Defines {
+            TEXTURE : Texture
+            VERTEX_COLOR : VertexColor
+        }
    }

 }
--- a/jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.vert
+++ b/jme3-core/src/main/resources/Common/MatDefs/Gui/Gui.vert
@ -1,3 +1,5 @@
+#import "Common/ShaderLib/GLSLCompat.glsllib"
+
 uniform mat4 g_WorldViewProjectionMatrix;
 uniform vec4 m_Color;