From ebd3dcf2b34e7626550bd608830fa831b78e5e14 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Tue, 3 Oct 2017 02:58:25 +0100 Subject: [PATCH] Remove unnecessary preprocessor variable in shaders --- files/shaders/lighting.glsl | 2 +- files/shaders/objects_fragment.glsl | 2 -- files/shaders/terrain_fragment.glsl | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl index afa636e3c3..8678d18dd9 100644 --- a/files/shaders/lighting.glsl +++ b/files/shaders/lighting.glsl @@ -14,7 +14,7 @@ void perLight(out vec3 ambientOut, out vec3 diffuseOut, int lightIndex, vec3 vie diffuseOut = diffuse.xyz * gl_LightSource[lightIndex].diffuse.xyz * max(dot(viewNormal.xyz, lightDir), 0.0) * illumination; } -#ifdef FRAGMENT +#ifdef PER_PIXEL_LIGHTING vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor, float shadowing) #else vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor, out vec3 shadowDiffuse) diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl index f90e5f8bab..b3bfa600b5 100644 --- a/files/shaders/objects_fragment.glsl +++ b/files/shaders/objects_fragment.glsl @@ -1,7 +1,5 @@ #version 120 -#define FRAGMENT - #if @diffuseMap uniform sampler2D diffuseMap; varying vec2 diffuseMapUV; diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl index 2e61caeb0f..9da9dfad5d 100644 --- a/files/shaders/terrain_fragment.glsl +++ b/files/shaders/terrain_fragment.glsl @@ -1,7 +1,5 @@ #version 120 -#define FRAGMENT - varying vec2 uv; uniform sampler2D diffuseMap;