Ticket #3640: preprocessor_include_initial_impl.patch

binaries/data/mods/public/maps/skirmishes/Acropolis

@@ -30 +30 @@
             <Contrast>0.96875</Contrast>
             <Saturation>1</Saturation>
             <Bloom>0.186523</Bloom>
-            <PostEffect>hdr</PostEffect>
+            <PostEffect>smaa</PostEffect>
         </Postproc>
     </Environment>
     <Camera>

binaries/data/mods/public/shaders/effects/postproc/smaa.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+    <technique>
+        <require shaders="glsl"/>
+        <pass shader="glsl/edge_detection"/>
+        <!--<pass shader="glsl/blending_weights"/>-->
+        <!--<pass shader="glsl/neighborhood_blending"/>-->
+    </technique>
+</effect>
+ No newline at end of file

binaries/data/mods/public/shaders/glsl/edge_detection.fs

@@ +1 @@
+#version 120
+
+uniform sampler2D renderedTex;
+
+varying vec2 v_tex;
+
+void main(void)
+{
+    gl_FragColor.rgb = texture2D(renderedTex, v_tex).rgb;
+    gl_FragColor.a = 1.0;
+}
+
+

binaries/data/mods/public/shaders/glsl/edge_detection.vs

@@ +1 @@
+#version 110
+
+#include "glsl/header.glsl"
+
+#define Y X
+
+varying vec2 v_tex;
+
+attribute vec3 a_vertex;
+attribute vec2 a_uv0;
+
+void main()
+{  
+  vec2 tmp = vec2(Y);
+  gl_Position = vec4(a_vertex, 1.0);  
+  v_tex = a_uv0;
+}
+ No newline at end of file

binaries/data/mods/public/shaders/glsl/edge_detection.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="glsl">
+    <vertex file="glsl/edge_detection.vs">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <attrib name="a_vertex" semantics="gl_Vertex"/>
+        <attrib name="a_uv0" semantics="gl_MultiTexCoord0"/>
+    </vertex>
+    <fragment file="glsl/edge_detection.fs"/>
+</program>

binaries/data/mods/public/shaders/glsl/header.glsl

@@ +1 @@
+#define X 1.0
+
+void m()
+{
+}
+ No newline at end of file

source/ps/Preprocessor.cpp

@@ -38 +38 @@
 
 #include "ps/CLogger.h"
 
+#include "ps/Filesystem.h" // to handle #include
+
 // Limit max number of macro arguments to this
 #define MAX_MACRO_ARGS 16
 
@@ -224 +226 @@
     return xt;
 }
 
+CPreprocessor::Macro *CPreprocessor::Macro::copy()
+{
+    Token mainCopy;
+
+    // Copy buffer once
+    char *buffer = new char[this->Body.Length];
+    strncpy(buffer, this->Body.String, this->Body.Length);
+
+    // Copy each subcomponent of Macro
+    Token body = Token(this->Body.Type, buffer, this->Body.Length);
+    Token name = Token(this->Name.Type, buffer, this->Name.Length);
+    Token value = Token(this->Value.Type, buffer + (this->Value.Buffer - this->Body.Buffer), this->Value.Length);
+
+    // FIXME: Ignore Args for now
+
+    Macro *macroCopy = new Macro(name);
+    macroCopy->Body = body;
+    macroCopy->Value = value;
+
+    return macroCopy;
+}
+
 //---------------------------------------------------------------------------//
 
 static void DefaultError (void *iData, int iLine, const char *iError,
@@ -700 +724 @@
             return false;
 
         case Token::TK_KEYWORD:
-        {
+        {
             // Try to expand the macro
-            Macro *m = IsDefined (*vt);
+            Macro *m = IsDefined (*vt);
             if (m != NULL && !m->Expanding)
             {
                 Token x = ExpandMacro (*vt);
@@ -715 +739 @@
             // Undefined macro, "expand" to 0 (mimic cpp behaviour)
             oValue = 0;
             break;
-        }
+        }
         case Token::TK_TEXT:
         case Token::TK_NUMBER:
             if (!vt->GetValue (oValue))
@@ -869 +893 @@
     return t;
 }
 
-bool CPreprocessor::HandleDefine (Token &iBody, int iLine)
+bool CPreprocessor::HandleDefine(Token &iBody, int iLine)
 {
     // Create an additional preprocessor to process macro body
-    CPreprocessor cpp (iBody, iLine);
+    CPreprocessor cpp(iBody, iLine);
 
-    Token t = cpp.GetToken (false);
+    Token t = cpp.GetToken(false);
     if (t.Type != Token::TK_KEYWORD)
     {
-        Error (iLine, "Macro name expected after #define");
+        Error(iLine, "Macro name expected after #define");
         return false;
     }
 
     bool output_enabled = ((EnableOutput & (EnableOutput + 1)) == 0);
     if (!output_enabled)
-        return true;
+        return true;
 
-    Macro *m = new Macro (t);
+    Macro *m = new Macro(t);
     m->Body = iBody;
-    t = cpp.GetArguments (m->NumArgs, m->Args, false);
+    t = cpp.GetArguments(m->NumArgs, m->Args, false);
     while (t.Type == Token::TK_WHITESPACE)
-        t = cpp.GetToken (false);
+        t = cpp.GetToken(false);
 
     switch (t.Type)
     {
-        case Token::TK_NEWLINE:
-        case Token::TK_EOS:
-            // Assign "" to token
-            t = Token (Token::TK_TEXT, "", 0);
-            break;
+    case Token::TK_NEWLINE:
+    case Token::TK_EOS:
+        // Assign "" to token
+        t = Token(Token::TK_TEXT, "", 0);
+        break;
 
-        case Token::TK_ERROR:
-            delete m;
-            return false;
+    case Token::TK_ERROR:
+        delete m;
+        return false;
 
-        default:
-            t.Type = Token::TK_TEXT;
-            ENSURE (t.String + t.Length == cpp.Source);
-            t.Length = cpp.SourceEnd - t.String;
-            break;
+    default:
+        t.Type = Token::TK_TEXT;
+        ENSURE(t.String + t.Length == cpp.Source);
+        t.Length = cpp.SourceEnd - t.String;
+        break;
     }
 
     m->Value = t;
@@ -979 +1003 @@
     return true;
 }
 
+CPreprocessor::Token CPreprocessor::HandleInclude(Token &iBody, int iLine)
+{
+    CPreprocessor cpp(iBody, iLine);
+
+    Token t = cpp.GetToken(false);
+
+    if (t.Type != Token::TK_STRING)
+    {
+        Error(iLine, "Expecting a file name after #include, got", &t);
+        return Token();
+    }
+
+    std::string filename = std::string(t.String).substr(0, t.Length);
+    ENSURE(filename.at(0) == '"' && filename.at(t.Length-1) == '"');
+    filename = filename.substr(1, t.Length - 2); // remove '"' symbols from the beginning and from the end of token
+
+    CVFSFile includedFile;
+    if (includedFile.Load(g_VFS, L"shaders/" + wstring_from_utf8(filename)) != PSRETURN_OK)
+        Error(iLine, "Warning: File not found", &t);
+    const CStr& input = includedFile.GetAsString();
+
+    size_t len = 0;
+    CPreprocessor preprocessor;
+    // preprocessor.AddDefines(m_Defines);
+    std::string includedSources = preprocessor.Parse(input.c_str(), input.size(), len);
+    char *result = new char[len];
+    includedSources.copy(result, len);
+
+    // Copy macros
+    Macro *m = preprocessor.MacroList;
+    while (m) {
+        Macro *copy = m->copy();
+        copy->Next = MacroList;
+        MacroList = copy;
+        m = m->Next;
+    }
+
+    if (!result)
+    {
+        Error(iLine, "Problem during preprocessing of included file", &t);
+        return Token();
+    }
+
+    do
+    {
+        t = cpp.GetToken(false);
+    } while (t.Type == Token::TK_WHITESPACE ||
+        t.Type == Token::TK_COMMENT ||
+        t.Type == Token::TK_LINECOMMENT);
+
+    if (t.Type != Token::TK_EOS)
+        Error(iLine, "Warning: Ignoring garbage after directive", &t);
+
+    return Token(Token::TK_STRING, result, len);;
+}
+
 CPreprocessor::Token CPreprocessor::ExpandDefined (CPreprocessor *iParent, int iNumArgs, Token *iArgs)
 {
     if (iNumArgs != 1)
@@ -1113 +1193 @@
     ((dirlen == sizeof (s) - 1) && (strncmp (directive, s, sizeof (s) - 1) == 0))
 
     bool rc;
-    if (IS_DIRECTIVE ("define"))
-        rc = HandleDefine (t, iLine);
+    if (IS_DIRECTIVE("define"))
+        rc = HandleDefine(t, iLine);
     else if (IS_DIRECTIVE ("undef"))
         rc = HandleUnDef (t, iLine);
     else if (IS_DIRECTIVE ("ifdef"))
@@ -1125 +1205 @@
         if (rc)
             EnableOutput ^= 1;
     }
+    else if (IS_DIRECTIVE("include"))
+        return HandleInclude(t, iLine);
     else if (IS_DIRECTIVE ("if"))
         rc = HandleIf (t, iLine);
     else if (IS_DIRECTIVE ("else"))
@@ -1176 +1258 @@
 
 void CPreprocessor::Define (const char *iMacroName, const char *iMacroValue)
 {
-    Define (iMacroName, strlen(iMacroName), iMacroValue, strlen(iMacroValue));
+    Define (iMacroName, strlen(iMacroName), iMacroValue, strlen(iMacroValue));
 }
 
 void CPreprocessor::Define (const char *iMacroName, long iMacroValue)
 {
-    Define (iMacroName, strlen(iMacroName), iMacroValue);
+    Define (iMacroName, strlen(iMacroName), iMacroValue);
 }
 
 bool CPreprocessor::Undef (const char *iMacroName, size_t iMacroNameLen)
@@ -1265 +1347 @@
 
                 if (output_enabled)
                     output.AppendNL (Line - old_line - t.CountNL ());
+                    
                 goto NextToken;
 
             case Token::TK_LINECONT:

source/ps/Preprocessor.h

@@ -200 +200 @@
 
         /// Expand the macro value (will not work for functions)
         Token Expand (int iNumArgs, Token *iArgs, Macro *iMacros);
+
+        /// Performs deep copy of this macro
+        Macro *copy();
     };
 
     friend class CPreprocessor::Macro;
@@ -278 +281 @@
      */
     bool HandleIfDef (Token &iBody, int iLine);
 
+    /**
+    * Handle a \#include directive.
+    * @param iBody
+    *     The body of the directive (everything after the directive
+    *     until end of line).
+    * @param iLine
+    *     The line where the directive begins (for error reports)
+    * @return
+    *     Included text enclosed in a token
+    */
+    Token HandleInclude (Token &iBody, int iLine);
+
     /**
      * Handle an \#if directive.
      * @param iBody