Răsfoiți Sursa

update Deferred shaders

Nikos Kastellanos 1 lună în urmă
părinte
comite
11806ed7bf

+ 15 - 0
Shaders/Deferred/Aether.Shaders.Deferred.csproj

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

+ 3 - 1
Shaders/Deferred/DeferredBasicEffect.cs

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

+ 3 - 1
Shaders/Deferred/DeferredClearGBufferEffect.cs

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

+ 3 - 1
Shaders/Deferred/DeferredCombineEffect.cs

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

+ 3 - 1
Shaders/Deferred/DeferredPointLightEffect.cs

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

+ 3 - 1
Shaders/Deferred/DeferredSpotLightEffect.cs

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

BIN
Shaders/Deferred/Resources/DeferredBasicEffect.dx11.fxo.11


BIN
Shaders/Deferred/Resources/DeferredBasicEffect.gles.fxo.11


BIN
Shaders/Deferred/Resources/DeferredBasicEffect.ogl.fxo.11


BIN
Shaders/Deferred/Resources/DeferredClearGBuffer.dx11.fxo.11


BIN
Shaders/Deferred/Resources/DeferredClearGBuffer.gles.fxo.11


BIN
Shaders/Deferred/Resources/DeferredClearGBuffer.ogl.fxo.11


BIN
Shaders/Deferred/Resources/DeferredCombine.dx11.fxo.11


BIN
Shaders/Deferred/Resources/DeferredCombine.gles.fxo.11


BIN
Shaders/Deferred/Resources/DeferredCombine.ogl.fxo.11


BIN
Shaders/Deferred/Resources/DeferredPointLight.dx11.fxo.11


BIN
Shaders/Deferred/Resources/DeferredPointLight.gles.fxo.11


BIN
Shaders/Deferred/Resources/DeferredPointLight.ogl.fxo.11


BIN
Shaders/Deferred/Resources/DeferredSpotLight.dx11.fxo.11


BIN
Shaders/Deferred/Resources/DeferredSpotLight.gles.fxo.11


BIN
Shaders/Deferred/Resources/DeferredSpotLight.ogl.fxo.11


+ 1 - 1
Shaders/Deferred/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 Build dx11