ecere/gfx/drivers/OpenGL: Fixed warnings about unused nnEyeToSurface on OS X/ATI

diff --git a/ecere/src/gfx/drivers/gl3/default.frag b/ecere/src/gfx/drivers/gl3/default.frag
index a748ddc..5a9f5b8 100644 (file)
--- a/ecere/src/gfx/drivers/gl3/default.frag
+++ b/ecere/src/gfx/drivers/gl3/default.frag
@@ -14,7 +14,7 @@
    varying vec3 tTangent2;
 #endif
 
-#if ENVIRONMENT_MAPPING || LIGHTING_ON
+#if ENVIRONMENT_MAPPING || (LIGHTING_ON && ((!NON_LOCAL_VIEWER && MAT_SPECULAR) || (LIGHT0_POSITIONAL || LIGHT1_POSITIONAL || LIGHT2_POSITIONAL || LIGHT3_POSITIONAL || LIGHT4_POSITIONAL || LIGHT5_POSITIONAL || LIGHT6_POSITIONAL || LIGHT7_POSITIONAL)))
    varying vec3 nnEyeToSurface;
 #endif
 

diff --git a/ecere/src/gfx/drivers/gl3/default.vert b/ecere/src/gfx/drivers/gl3/default.vert
index bf9f859..eec74db 100644 (file)
--- a/ecere/src/gfx/drivers/gl3/default.vert
+++ b/ecere/src/gfx/drivers/gl3/default.vert
@@ -9,7 +9,7 @@ uniform mat4 projection_matrix;
    attribute vec4 color;
 #endif
 
-#if ENVIRONMENT_MAPPING || LIGHTING_ON
+#if ENVIRONMENT_MAPPING || (LIGHTING_ON && ((!NON_LOCAL_VIEWER && MAT_SPECULAR) || (LIGHT0_POSITIONAL || LIGHT1_POSITIONAL || LIGHT2_POSITIONAL || LIGHT3_POSITIONAL || LIGHT4_POSITIONAL || LIGHT5_POSITIONAL || LIGHT6_POSITIONAL || LIGHT7_POSITIONAL)))
    varying vec3 nnEyeToSurface;
 #endif
 
@@ -59,7 +59,7 @@ void main(void)
    vec4 pos = vec4(vertex, 1.0);
 #endif
 
-#if ENVIRONMENT_MAPPING || LIGHTING_ON
+#if ENVIRONMENT_MAPPING || (LIGHTING_ON && ((!NON_LOCAL_VIEWER && MAT_SPECULAR) || (LIGHT0_POSITIONAL || LIGHT1_POSITIONAL || LIGHT2_POSITIONAL || LIGHT3_POSITIONAL || LIGHT4_POSITIONAL || LIGHT5_POSITIONAL || LIGHT6_POSITIONAL || LIGHT7_POSITIONAL)))
    nnEyeToSurface = vec3(pos.x, -pos.y, pos.z) * nearPlane;
 #endif