sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #294 from davidB/david_gl3_mrt_unshaded

Browse Source 
add GL3 support for Unshaded and MRT (v2)
This commit is contained in:
Kirill Vainer 2015-07-13 16:44:44 -04:00
commit cad8ca4d8e
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
View File

@ -401,7 +401,7 @@ public class GLRenderer implements Renderer {
} }
} }
if (hasExtension("GL_ARB_draw_buffers")) { if (hasExtension("GL_ARB_draw_buffers") || gl3 != null) {
limits.put(Limits.FrameBufferMrtAttachments, getInteger(GLExt.GL_MAX_DRAW_BUFFERS_ARB)); limits.put(Limits.FrameBufferMrtAttachments, getInteger(GLExt.GL_MAX_DRAW_BUFFERS_ARB));
if (limits.get(Limits.FrameBufferMrtAttachments) > 1) { if (limits.get(Limits.FrameBufferMrtAttachments) > 1) {
caps.add(Caps.FrameBufferMRT); caps.add(Caps.FrameBufferMRT);
@ -1080,6 +1080,7 @@ public class GLRenderer implements Renderer {
if (linearizeSrgbImages) { if (linearizeSrgbImages) {
stringBuf.append("#define SRGB 1\n"); stringBuf.append("#define SRGB 1\n");
} }
stringBuf.append("#define ").append(source.getType().name().toUpperCase()).append("_SHADER 1\n");
stringBuf.append(source.getDefines()); stringBuf.append(source.getDefines());
stringBuf.append(source.getSource()); stringBuf.append(source.getSource());

2
jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.frag
View File

@ -1,3 +1,5 @@
#import "Common/ShaderLib/GLSL150Compat.glsllib"
#if defined(HAS_GLOWMAP) || defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPARATE_TEXCOORD)) #if defined(HAS_GLOWMAP) || defined(HAS_COLORMAP) || (defined(HAS_LIGHTMAP) && !defined(SEPARATE_TEXCOORD))
#define NEED_TEXCOORD1 #define NEED_TEXCOORD1
#endif #endif

23
jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.j3md
View File

@ -54,8 +54,8 @@ MaterialDef Unshaded {
} }
Technique { Technique {
VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert VertexShader GLSL150: Common/MatDefs/Misc/Unshaded.vert
FragmentShader GLSL100: Common/MatDefs/Misc/Unshaded.frag FragmentShader GLSL150: Common/MatDefs/Misc/Unshaded.frag
WorldParameters { WorldParameters {
WorldViewProjectionMatrix WorldViewProjectionMatrix
@ -76,6 +76,25 @@ MaterialDef Unshaded {
} }
Technique { Technique {
VertexShader GLSL100: Common/MatDefs/Misc/Unshaded.vert
FragmentShader GLSL100: Common/MatDefs/Misc/Unshaded.frag
WorldParameters {
WorldViewProjectionMatrix
ViewProjectionMatrix
ViewMatrix
}
Defines {
INSTANCING : UseInstancing
SEPARATE_TEXCOORD : SeparateTexCoord
HAS_COLORMAP : ColorMap
HAS_LIGHTMAP : LightMap
HAS_VERTEXCOLOR : VertexColor
HAS_COLOR : Color
NUM_BONES : NumberOfBones
DISCARD_ALPHA : AlphaDiscardThreshold
}
} }
Technique PreNormalPass { Technique PreNormalPass {

1
jme3-core/src/main/resources/Common/MatDefs/Misc/Unshaded.vert
View File

@ -1,3 +1,4 @@
#import "Common/ShaderLib/GLSL150Compat.glsllib"
#import "Common/ShaderLib/Skinning.glsllib" #import "Common/ShaderLib/Skinning.glsllib"
#import "Common/ShaderLib/Instancing.glsllib" #import "Common/ShaderLib/Instancing.glsllib"

2
jme3-core/src/main/resources/Common/ShaderLib/GLSL150Compat.glsllib
View File

@ -1,4 +1,4 @@
#if _VERSION_ >= 150 #if __VERSION__ >= 130
out vec4 outFragColor; out vec4 outFragColor;
# define texture1D texture # define texture1D texture
# define texture2D texture # define texture2D texture