update fallback to MGFX 10 and seperate GL shaders

Shaders/Deferred/Aether.Shaders.Deferred.csproj

@@ -41,6 +41,11 @@
     <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.10" />
     <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.10" />
     <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredCombine.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.gles.fxo.10" />
     <EmbeddedResource Include="Resources\DeferredBasicEffect.ogl.fxo.10" />
     <EmbeddedResource Include="Resources\DeferredClearGBuffer.ogl.fxo.10" />
     <EmbeddedResource Include="Resources\DeferredCombine.ogl.fxo.10" />

Shaders/Deferred/DeferredBasicEffect.cs

@@ -63,27 +63,33 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version
             version = ".10";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
-            if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif
 

Shaders/Deferred/DeferredClearGBufferEffect.cs

@@ -58,12 +58,14 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version
@@ -71,14 +73,19 @@ namespace nkast.Aether.Shaders
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
             if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif
 

Shaders/Deferred/DeferredCombineEffect.cs

@@ -62,27 +62,33 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version
             version = ".10";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
-            if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif
 

Shaders/Deferred/DeferredPointLightEffect.cs

@@ -75,27 +75,33 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version  
             version = ".10";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
-            if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif
 

Shaders/Deferred/DeferredSpotLightEffect.cs

@@ -80,27 +80,33 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version  
             version = ".10";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
-            if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif
 

Shaders/Deferred/Shaders/BuildShaders.bat

@@ -20,6 +20,14 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
     call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.fxo /Platform:DesktopGL
 )
 
+@echo .
+@echo Build gles
+@for /f %%f IN ('dir /b *.fx') do (
+    @echo .
+    @echo Compile %%~nf
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gles.fxo /Platform:Android
+)
+
 @echo Build dx9/xna Reach
 @for /f %%f IN ('dir /b *.fx') do (
     @echo .

Shaders/FXAA/Aether.Shaders.FXAA.csproj

@@ -37,6 +37,9 @@
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.10" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.10" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.gles.fxo.10" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.ogl.fxo.10" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.ogl.fxo.10" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.ogl.fxo.10" />

Shaders/FXAA/FXAAEffect.cs

@@ -73,27 +73,33 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version
             version = ".10";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
-            if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif
 

Shaders/FXAA/Shaders/BuildShaders.bat

@@ -22,6 +22,14 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
     call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.fxo /Platform:DesktopGL
 )
 
+@echo .
+@echo Build gles
+@for /f %%f IN ('dir /b *.fx') do (
+    @echo .
+    @echo Compile %%~nf
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gles.fxo /Platform:Android
+)
+
 @echo .
 @echo Build dx9/xna HiDef
 @for /f %%f IN ('dir /b *.fx') do (

Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.csproj

@@ -35,6 +35,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.fxo.10" />
     <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.gles.fxo.10" />
     <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.ogl.fxo.10" />
     <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.ogl.fxo.10" />
   </ItemGroup>

Shaders/InfiniteGrid/InfiniteGridEffect.cs

@@ -56,27 +56,33 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version
             version = ".10";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
-            if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif
 

Shaders/InfiniteGrid/Shaders/BuildShaders.bat

@@ -22,6 +22,14 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
     call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.fxo /Platform:DesktopGL
 )
 
+@echo .
+@echo Build gles
+@for /f %%f IN ('dir /b *.fx') do (
+    @echo .
+    @echo Compile %%~nf
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gles.fxo /Platform:Android
+)
+
 @echo .
 @echo Build dx9/xna Reach
 @for /f %%f IN ('dir /b *.Reach.fx') do (

Shaders/Tilemap/Aether.Shaders.Tilemap.csproj

@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\TilemapEffect.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\TilemapEffect.gles.fxo.10" />
     <EmbeddedResource Include="Resources\TilemapEffect.ogl.fxo.10" />
   </ItemGroup>
   <ItemGroup>

Shaders/Tilemap/Shaders/BuildShaders.bat

@@ -22,6 +22,14 @@ SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
     call %MGFX% %%~nf.fx ..\Resources\%%~nf.ogl.fxo /Platform:DesktopGL
 )
 
+@echo .
+@echo Build gles
+@for /f %%f IN ('dir /b *.fx') do (
+    @echo .
+    @echo Compile %%~nf
+    call %MGFX% %%~nf.fx ..\Resources\%%~nf.gles.fxo /Platform:Android
+)
+
 @echo .
 @echo Build dx9/xna Reach
 @for /f %%f IN ('dir /b *.fx') do (

Shaders/Tilemap/TilemapEffect.cs

@@ -90,27 +90,33 @@ namespace nkast.Aether.Shaders
                     platformName = ".dx11.fxo";
                     break;
                 case GraphicsBackend.OpenGL:
+                    platformName = ".ogl.fxo";
+                    break;
                 case GraphicsBackend.GLES:
                 case GraphicsBackend.WebGL:
-                    platformName = ".ogl.fxo";
+                    platformName = ".gles.fxo";
                     break;
                 default:
-                    throw new NotSupportedException("platform");
+                    throw new NotSupportedException("Backend");
             }
 
             // Detect version
             version = ".10";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
-            if (kniVersion.Major == 3)
             {
-                if (kniVersion.Minor == 9)
-                {
+                if (kniVersion.Minor ==  9
+                ||  kniVersion.Minor == 10
+                ||  kniVersion.Minor == 11
+                ||  kniVersion.Minor == 12
+                ||  kniVersion.Minor == 13
+                ||  kniVersion.Minor == 14)
                     version = ".10";
-                }
-                if (kniVersion.Minor == 10)
-                {
+            }
+            if (kniVersion.Major == 4)
+            {
+                if (kniVersion.Minor == 0
+                ||  kniVersion.Minor == 1)
                     version = ".10";
-                }
             }
 #endif