Merge pull request #14 from tainicom/UpgradeShaders

Upgrade Shaders to MGFX v9

Shaders/Deferred/Aether.Shaders.Deferred.W10.csproj

@@ -141,6 +141,11 @@
     <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.8" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.9" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">

Shaders/Deferred/Aether.Shaders.Deferred.W8_1.csproj

@@ -56,6 +56,11 @@
     <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.8" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.9" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MonoGame.Framework">

Shaders/Deferred/Aether.Shaders.Deferred.WINDOWS.MG.csproj

@@ -58,6 +58,11 @@
     <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.8" />
+    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredCombine.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.mgfxo.9" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Shaders/Deferred/DeferredBasicEffect.cs

@@ -57,7 +57,7 @@ namespace tainicom.Aether.Shaders
             // Detect MG version     
             var version = "";
 #if !XNA
-            version = ".8";
+            version = ".9";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -69,6 +69,8 @@ namespace tainicom.Aether.Shaders
                     version = ".8";
                 if (mgVersion.Minor == 7)
                     version = ".8";
+                if (mgVersion.Minor == 8)
+                    version = ".9";
             }
             name = name + version;
 #endif

Shaders/Deferred/DeferredClearGBufferEffect.cs

@@ -52,7 +52,7 @@ namespace tainicom.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".8";
+            version = ".9";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -64,6 +64,8 @@ namespace tainicom.Aether.Shaders
                     version = ".8";
                 if (mgVersion.Minor == 7)
                     version = ".8";
+                if (mgVersion.Minor == 8)
+                    version = ".9";
             }
             name = name + version;
 #endif

Shaders/Deferred/DeferredCombineEffect.cs

@@ -56,7 +56,7 @@ namespace tainicom.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".8";
+            version = ".9";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -68,6 +68,8 @@ namespace tainicom.Aether.Shaders
                     version = ".8";
                 if (mgVersion.Minor == 7)
                     version = ".8";
+                if (mgVersion.Minor == 8)
+                    version = ".9";
             }
             name = name + version;
 #endif

Shaders/Deferred/DeferredPointLightEffect.cs

@@ -69,7 +69,7 @@ namespace tainicom.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".8";
+            version = ".9";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -81,6 +81,8 @@ namespace tainicom.Aether.Shaders
                     version = ".8";
                 if (mgVersion.Minor == 7)
                     version = ".8";
+                if (mgVersion.Minor == 8)
+                    version = ".9";
             }
             name = name + version;
 #endif

Shaders/Deferred/DeferredSpotLightEffect.cs

@@ -73,7 +73,7 @@ namespace tainicom.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".8";
+            version = ".9";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -85,6 +85,8 @@ namespace tainicom.Aether.Shaders
                     version = ".8";
                 if (mgVersion.Minor == 7)
                     version = ".8";
+                if (mgVersion.Minor == 8)
+                    version = ".9";
             }
             name = name + version;
 #endif

Shaders/FXAA/Aether.Shaders.FXAA.W10.csproj

@@ -139,6 +139,9 @@
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.9" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">

Shaders/FXAA/Aether.Shaders.FXAA.W8_1.csproj

@@ -54,6 +54,9 @@
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.9" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MonoGame.Framework">

Shaders/FXAA/Aether.Shaders.FXAA.WINDOWS.MG.csproj

@@ -56,6 +56,9 @@
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.8" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.mgfxo.9" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Shaders/FXAA/FXAAEffect.cs

@@ -63,7 +63,7 @@ namespace tainicom.Aether.Shaders
             // Detect MG version
             var version = "";
 #if !XNA
-            version = ".8";
+            version = ".9";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -75,6 +75,8 @@ namespace tainicom.Aether.Shaders
                     version = ".8";
                 if (mgVersion.Minor == 7)
                     version = ".8";
+                if (mgVersion.Minor == 8)
+                    version = ".9";
             }
             name = name + version;
 #endif

Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.WINDOWS.MG.csproj

@@ -46,9 +46,11 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.mgfxo.7" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.mgfxo.7" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.mgfxo.8" />
     <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.mgfxo.8" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.mgfxo.9" />
+    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.mgfxo.9" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Shaders/InfiniteGrid/InfiniteGridEffect.cs

@@ -54,7 +54,7 @@ namespace tainicom.Aether.Shaders
             // Detect MG version
             var version = "";
 #if !XNA
-            version = ".8";
+            version = ".9";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -66,6 +66,8 @@ namespace tainicom.Aether.Shaders
                     version = ".8";
                 if (mgVersion.Minor == 7)
                     version = ".8";
+                if (mgVersion.Minor == 8)
+                    version = ".9";
             }
 #endif