Nikos Kastellanos 1 месяц назад
Родитель
Сommit
e4dadb3d83

+ 2 - 2
Samples/FXAA/FXAA.Shared/AntiAliasing.cs

@@ -41,7 +41,7 @@ namespace Samples.FXAA
 			#if(WINDOWS)
             try
             {
-                if (_graphicsDevice.GraphicsProfile >= GraphicsProfile.HiDef)          
+                if (_graphicsDevice.GraphicsProfile >= GraphicsProfile.FL10_0)          
                 {
                     fxaaGreenLumaMediumEffect = new FXAAGreenLumaMediumEffect(_graphicsDevice);
                     fxaaGreenLumaHighEffect = new FXAAGreenLumaHighEffect(_graphicsDevice);
@@ -84,7 +84,7 @@ namespace Samples.FXAA
                 {
                     fxaaGreenLumaLowEffect.SetDefaultParameters(maxWidth, maxHeight);
                 }
-                if (_graphicsDevice.GraphicsProfile >= GraphicsProfile.HiDef)
+                if (_graphicsDevice.GraphicsProfile >= GraphicsProfile.FL10_0)
                 {
                     fxaaGreenLumaMediumEffect.SetDefaultParameters(maxWidth, maxHeight);
                     fxaaGreenLumaHighEffect.SetDefaultParameters(maxWidth, maxHeight);

+ 1 - 1
Samples/FXAA/FXAA.Shared/FXAAGame.cs

@@ -15,7 +15,7 @@ namespace Samples.FXAA
             graphics = new GraphicsDeviceManager(this);
             Content.RootDirectory = "Content";
 
-            graphics.GraphicsProfile = GraphicsProfile.HiDef;
+            graphics.GraphicsProfile = GraphicsProfile.FL10_0;
 
             _fxaaSampleComponent = new FXAASampleComponent(this);
             Components.Add(_fxaaSampleComponent);

+ 10 - 0
Shaders/FXAA/Aether.Shaders.FXAA.csproj

@@ -35,14 +35,24 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.gles.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.gles.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.gles.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.gles.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.ogl.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.ogl.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaLow.ogl.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.ogl.fxo.11" />
     <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.ogl.fxo.10" />
+    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.ogl.fxo.11" />
+	  
   </ItemGroup>
 
   <ItemGroup>

+ 3 - 1
Shaders/FXAA/FXAAEffect.cs

@@ -84,7 +84,7 @@ namespace nkast.Aether.Shaders
             }
 
             // Detect version
-            version = ".10";
+            version = ".11";
             Version kniVersion = typeof(Effect).Assembly.GetName().Version;
             {
                 if (kniVersion.Minor ==  9
@@ -100,6 +100,8 @@ namespace nkast.Aether.Shaders
                 if (kniVersion.Minor == 0
                 ||  kniVersion.Minor == 1)
                     version = ".10";
+                if (kniVersion.Minor == 2)
+                    version = ".11";
             }
 #endif
 

BIN
Shaders/FXAA/Resources/FXAAGreenLumaHigh.dx11.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaHigh.gles.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaHigh.ogl.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaLow.dx11.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaLow.gles.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaLow.ogl.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaMedium.dx11.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaMedium.gles.fxo.11


BIN
Shaders/FXAA/Resources/FXAAGreenLumaMedium.ogl.fxo.11


+ 1 - 1
Shaders/FXAA/Shaders/BuildShaders.bat

@@ -3,7 +3,7 @@ setlocal
 
 cd %~dp0
 
-SET MGFX="C:\Program Files (x86)\KNI\v4.1\Tools\KNIFXC.exe"
+SET MGFX="C:\Program Files (x86)\KNI\v4.2\Tools\KNIFXC.exe"
 SET XNAFX="..\..\Tools\CompileEffect\CompileEffect.exe"
 
 @echo .

+ 2 - 2
Shaders/FXAA/Shaders/FXAAGreenLumaHigh.fx

@@ -100,8 +100,8 @@ technique FXAA
         VertexShader = compile vs_4_0 VertexShaderFunction();
         PixelShader = compile ps_4_0 PixelShaderFunction_FXAA();
 #else
-        VertexShader = compile vs_3_0 VertexShaderFunction();
-        PixelShader = compile ps_3_0 PixelShaderFunction_FXAA();
+        VertexShader = compile vs_4_0 VertexShaderFunction();
+        PixelShader = compile ps_4_0 PixelShaderFunction_FXAA();
 #endif
     }
 }

+ 2 - 2
Shaders/FXAA/Shaders/FXAAGreenLumaLow.fx

@@ -99,8 +99,8 @@ technique FXAA
         VertexShader = compile vs_4_0_level_9_1 VertexShaderFunction();
         PixelShader = compile ps_4_0_level_9_3 PixelShaderFunction_FXAA();
 #else
-        VertexShader = compile vs_3_0 VertexShaderFunction();
-        PixelShader = compile ps_3_0 PixelShaderFunction_FXAA();
+        VertexShader = compile vs_2_0 VertexShaderFunction();
+        PixelShader = compile ps_4_0 PixelShaderFunction_FXAA();
 #endif
     }
 }

+ 2 - 2
Shaders/FXAA/Shaders/FXAAGreenLumaMedium.fx

@@ -100,8 +100,8 @@ technique FXAA
         VertexShader = compile vs_4_0 VertexShaderFunction();
         PixelShader = compile ps_4_0 PixelShaderFunction_FXAA();
 #else
-        VertexShader = compile vs_3_0 VertexShaderFunction();
-        PixelShader = compile ps_3_0 PixelShaderFunction_FXAA();
+        VertexShader = compile vs_4_0 VertexShaderFunction();
+        PixelShader = compile ps_4_0 PixelShaderFunction_FXAA();
 #endif
     }
 }