Cleanup|Shaders: Use the #include directive

skyjake · May 2, 2017 · df88dd7 · df88dd7
1 parent 6bb6e36
commit df88dd7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl.dei
@@ -1,5 +1,4 @@
 # Shader for the DGL drawing routines that emulate OpenGL 1.x behavior.
 shader dgl.draw {
-    path.vertex   = "dgl_draw.vsh"
-    path.fragment = "dgl_draw.fsh"
+    path = "dgl_draw"
 }
diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/generic.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/generic.dei
@@ -112,8 +112,9 @@ generic {
                     vUV = aUV;
                     vColor = aColor * uColor;
                 }"
-            include.fragment <include/hsv.glsl>
             fragment = "
+                #include 'include/hsv.glsl'
+
                 uniform sampler2D uTex;
                 uniform float uSaturation;                
                 in vec2 vUV;

diff --git a/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/ui.dei b/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/ui.dei
@@ -26,8 +26,9 @@ ui {
                 vScissor = uScissorRect[index];
                 vSaturation = uSaturation[index];
             }"
-        include.fragment <include/hsv.glsl>
         fragment = "
+            #include 'include/hsv.glsl'
+
             uniform sampler2D uTex;
 
             in vec2 vUV;

diff --git a/doomsday/sdk/libgui/src/graphics/glshaderbank.cpp b/doomsday/sdk/libgui/src/graphics/glshaderbank.cpp
@@ -36,7 +36,7 @@ namespace de {
 
 static String processIncludes(String source, String const &sourceFolderPath)
 {
-    QRegularExpression const re("#include\\s+\"([^\"]+)\"");
+    QRegularExpression const re("#include\\s+['\"]([^\"']+)['\"]");
     forever
     {
         auto found = re.match(source);