From 62d92d75ca6c4c15a4d4965192283444c61f78e2 Mon Sep 17 00:00:00 2001 From: Riccardo Balbo Date: Tue, 19 Jul 2016 12:15:55 +0200 Subject: [PATCH] Use texture() instead of texture2D() in bloomExtract15 and bloomFinal15 --- .../src/main/resources/Common/MatDefs/Post/bloomExtract15.frag | 2 +- .../src/main/resources/Common/MatDefs/Post/bloomFinal15.frag | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomExtract15.frag b/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomExtract15.frag index 7194f9c7d..eafdf369d 100644 --- a/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomExtract15.frag +++ b/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomExtract15.frag @@ -24,7 +24,7 @@ void main(){ #endif #ifdef HAS_GLOWMAP - vec4 glowColor = texture2D( m_GlowMap, texCoord ); + vec4 glowColor = texture( m_GlowMap, texCoord ); glowColor = pow(glowColor, vec4(m_ExposurePow)); color += glowColor; #endif diff --git a/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomFinal15.frag b/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomFinal15.frag index b8f322d11..13ec7cc99 100644 --- a/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomFinal15.frag +++ b/jme3-effects/src/main/resources/Common/MatDefs/Post/bloomFinal15.frag @@ -10,7 +10,7 @@ out vec4 fragColor; void main(){ vec4 colorRes = getColor(m_Texture,texCoord); - vec4 bloom = texture2D(m_BloomTex, texCoord); + vec4 bloom = texture(m_BloomTex, texCoord); fragColor = bloom * m_BloomIntensity + colorRes; }