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

* ToneMap.frag: Fix warning about gl_FragColor when compiling for GLSL 1.5 and higher

Browse Source
This commit is contained in:
shadowislord 2014-06-03 23:09:01 -04:00
parent 71472bbf90
commit 406d244e01
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jme3-effects/src/main/resources/Common/MatDefs/Post/ToneMap.frag
View File

@ -5,6 +5,7 @@ uniform vec3 m_WhitePoint;
#if __VERSION__ >= 150 #if __VERSION__ >= 150
in vec2 texCoord; in vec2 texCoord;
out vec4 outFragColor;
#else #else
varying vec2 texCoord; varying vec2 texCoord;
#endif #endif
@ -34,5 +35,10 @@ void main() {
vec4 texVal = getColor(m_Texture, texCoord); vec4 texVal = getColor(m_Texture, texCoord);
vec3 toneMapped = ToneMap_Filmic(texVal.rgb, m_WhitePoint); vec3 toneMapped = ToneMap_Filmic(texVal.rgb, m_WhitePoint);
gl_FragColor = vec4(toneMapped, texVal.a);
#if __VERSION__ >= 150
outFragColor = vec4(toneMapped, texVal.a);
#else
gl_FragColor = vec4(toneMapped, texVal.a);
#endif
} }