Remove pointless static guards

[xonotic/netradiant.git] / plugins / shaders / shaders.cpp

diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp
index a7a3078dbbde5f319d21b777f7fde25ad25184e3..72757fca8dfef769a24e4870f5693a6d6b54dd46 100644 (file)
--- a/plugins/shaders/shaders.cpp
+++ b/plugins/shaders/shaders.cpp
@@ -123,7 +123,6 @@ Image& convertHeightmapToNormalmap( Image& heightmap, float scale ){
        byte* in = heightmap.getRGBAPixels();
        byte* out = normalmap.getRGBAPixels();
 
-#if 1
        // no filtering
        const int kernelSize = 2;
        KernelElement kernel_du[kernelSize] = {
@@ -134,26 +133,6 @@ Image& convertHeightmapToNormalmap( Image& heightmap, float scale ){
                { 0, 1, 0.5f },
                { 0,-1,-0.5f }
        };
-#else
-       // 3x3 Prewitt
-       const int kernelSize = 6;
-       KernelElement kernel_du[kernelSize] = {
-               {-1, 1,-1.0f },
-               {-1, 0,-1.0f },
-               {-1,-1,-1.0f },
-               { 1, 1, 1.0f },
-               { 1, 0, 1.0f },
-               { 1,-1, 1.0f }
-       };
-       KernelElement kernel_dv[kernelSize] = {
-               {-1, 1, 1.0f },
-               { 0, 1, 1.0f },
-               { 1, 1, 1.0f },
-               {-1,-1,-1.0f },
-               { 0,-1,-1.0f },
-               { 1,-1,-1.0f }
-       };
-#endif
 
        int x, y = 0;
        while ( y < h )
@@ -591,11 +570,6 @@ bool ShaderTemplate::parseDoom3( Tokeniser& tokeniser ){
                        else if ( string_equal_nocase( token, "zeroclamp" ) ) {
                                currentLayer.m_clampToBorder = true;
                        }
-#if 0
-                       else if ( string_equal_nocase( token, "alphaTest" ) ) {
-                               Tokeniser_getFloat( tokeniser, currentLayer.m_alphaTest );
-                       }
-#endif
                }
                else if ( depth == 1 ) {
                        if ( string_equal_nocase( token, "qer_editorimage" ) ) {