Improvements to Preprocessor - spaces after #else, comments in #inclu…

…de blocks (#7377) Co-authored-by: Martin Valigursky <[email protected]>
playcanvas · Feb 26, 2025 · 154384f · 154384f
1 parent 2476954
commit 154384f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/preprocessor.js b/src/core/preprocessor.js
@@ -22,7 +22,7 @@ const UNDEF = /undef[ \t]+([^\n]+)\r?(?:\n|$)/g;
 const IF = /(ifdef|ifndef|if)[ \t]*([^\r\n]+)\r?\n/g;
 
 // #endif/#else or #elif EXPRESSION
-const ENDIF = /(endif|else|elif)([ \t][^\r\n]+)?\r?(?:\n|$)/g;
+const ENDIF = /(endif|else|elif)(?:[ \t]+([^\r\n]*))?\r?\n?/g;
 
 // identifier
 const IDENTIFIER = /([\w-]+)/;
@@ -402,6 +402,8 @@ class Preprocessor {
                         let includeSource = includes?.get(identifier);
                         if (includeSource !== undefined) {
 
+                            includeSource = this.stripComments(includeSource);
+
                             // handle second identifier specifying loop count
                             if (countIdentifier) {
                                 const countString = defines.get(countIdentifier);

diff --git a/src/extras/render-passes/render-pass-compose.js b/src/extras/render-passes/render-pass-compose.js
@@ -13,7 +13,6 @@ import { GAMMA_NONE, GAMMA_SRGB, gammaNames, TONEMAP_LINEAR, tonemapNames } from
 const fragmentShader = /* glsl */ `
 
     #include "tonemappingPS"
-    #include "decodePS"
     #include "gammaPS"
 
     varying vec2 uv0;