From cf195152d6fee104b457752166f6b410054177a7 Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Tue, 16 Dec 2014 00:30:50 +0100 Subject: [PATCH] Workaround for OpenGL terrain blend on Intel drivers. --- Templates/Empty/game/shaders/common/terrain/terrain.glsl | 3 +-- Templates/Full/game/shaders/common/terrain/terrain.glsl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Templates/Empty/game/shaders/common/terrain/terrain.glsl b/Templates/Empty/game/shaders/common/terrain/terrain.glsl index 414c5de24..79f80888c 100644 --- a/Templates/Empty/game/shaders/common/terrain/terrain.glsl +++ b/Templates/Empty/game/shaders/common/terrain/terrain.glsl @@ -35,8 +35,7 @@ float calcBlend( float texId, vec2 layerCoord, float layerSize, vec4 layerSample // match the current texture id. vec4 factors = vec4(0); for(int i = 0; i < 4; i++) - if(layerSample[i] == texId) - factors[i] = 1; + factors[i] = (layerSample[i] == texId) ? 1 : 0; // workaround for Intel // This is a custom bilinear filter. diff --git a/Templates/Full/game/shaders/common/terrain/terrain.glsl b/Templates/Full/game/shaders/common/terrain/terrain.glsl index 414c5de24..79f80888c 100644 --- a/Templates/Full/game/shaders/common/terrain/terrain.glsl +++ b/Templates/Full/game/shaders/common/terrain/terrain.glsl @@ -35,8 +35,7 @@ float calcBlend( float texId, vec2 layerCoord, float layerSize, vec4 layerSample // match the current texture id. vec4 factors = vec4(0); for(int i = 0; i < 4; i++) - if(layerSample[i] == texId) - factors[i] = 1; + factors[i] = (layerSample[i] == texId) ? 1 : 0; // workaround for Intel // This is a custom bilinear filter.