Browse Source

Embed v10 shaders

Nick Kastellanos 2 years ago
parent
commit
541b99a275

+ 5 - 0
Shaders/Deferred/Aether.Shaders.Deferred.W10.csproj

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

+ 5 - 0
Shaders/Deferred/Aether.Shaders.Deferred.WINDOWS.MG.csproj

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

+ 5 - 1
Shaders/Deferred/DeferredBasicEffect.cs

@@ -57,7 +57,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version     
             var version = "";
 #if !XNA
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -66,7 +66,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
             name = name + version;
 #endif

+ 5 - 1
Shaders/Deferred/DeferredClearGBufferEffect.cs

@@ -52,7 +52,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -61,7 +61,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
             name = name + version;
 #endif

+ 5 - 1
Shaders/Deferred/DeferredCombineEffect.cs

@@ -56,7 +56,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -65,7 +65,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
             name = name + version;
 #endif

+ 5 - 1
Shaders/Deferred/DeferredPointLightEffect.cs

@@ -69,7 +69,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -78,7 +78,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
             name = name + version;
 #endif

+ 5 - 1
Shaders/Deferred/DeferredSpotLightEffect.cs

@@ -73,7 +73,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version            
             var version = "";
 #if !XNA
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -82,7 +82,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
             name = name + version;
 #endif

+ 3 - 0
Shaders/FXAA/Aether.Shaders.FXAA.W10.csproj

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

+ 3 - 0
Shaders/FXAA/Aether.Shaders.FXAA.WINDOWS.MG.csproj

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

+ 5 - 1
Shaders/FXAA/FXAAEffect.cs

@@ -63,7 +63,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version
             var version = "";
 #if !XNA
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -72,7 +72,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
             name = name + version;
 #endif

+ 2 - 0
Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.WINDOWS.MG.csproj

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

+ 5 - 1
Shaders/InfiniteGrid/InfiniteGridEffect.cs

@@ -54,7 +54,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version
             var version = "";
 #if !XNA
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -63,7 +63,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
 #endif
 

+ 5 - 1
Shaders/Tilemap/TilemapEffect.cs

@@ -84,7 +84,7 @@ namespace nkast.Aether.Shaders
             // Detect MG version
             var version = "";
 #if !XNA && !PORTABLE
-            version = ".9";
+            version = ".10";
             var mgVersion = GetAssembly(typeof(Effect)).GetName().Version;
             if (mgVersion.Major == 3)
             {
@@ -93,7 +93,11 @@ namespace nkast.Aether.Shaders
                 if (mgVersion.Minor == 7)
                     version = ".8";
                 if (mgVersion.Minor == 8)
+                {
                     version = ".9";
+                    if (mgVersion.Build == 1 || mgVersion.Build >= 9100)
+                        version = ".10";
+                }
             }
             name = name + version;
 #endif