updated FShade

- removed old Compiler Service dlls Former-commit-id: cb69067
aardvark-platform · Nov 20, 2017 · 4fd641d · 4fd641d
1 parent 31a8507
commit 4fd641d
Show file tree

Hide file tree

Showing 9 changed files with 4,312 additions and 4,285 deletions.
diff --git a/lib/Release/FSharp.Compiler.Service.dll b/lib/Release/FSharp.Compiler.Service.dll
diff --git a/lib/Release/QuotationCompiler.dll b/lib/Release/QuotationCompiler.dll
diff --git a/paket.dependencies b/paket.dependencies
@@ -8,9 +8,9 @@ nuget Aardvark.Base.FSharp               ~> 3.0.39
 nuget Aardvark.Base.Incremental          ~> 3.0.39
 nuget Aardvark.Base.Runtime              ~> 3.0.39
 
-nuget FShade.Core                        ~> 3.3.5
-nuget FShade                             ~> 3.3.5
-nuget FShade.Debug                       ~> 3.3.5
+nuget FShade.Core                        ~> 3.3.7
+nuget FShade                             ~> 3.3.7
+nuget FShade.Debug                       ~> 3.3.7
 
 nuget GLSLangSharp                       ~> 0.3.8
 nuget Unofficial.OpenVR					 ~> 1.0.10

diff --git a/paket.lock b/paket.lock
@@ -1,21 +1,21 @@
 RESTRICTION: == net45
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    Aardvark.Base (3.0.42)
+    Aardvark.Base (3.0.44)
       DevILSharp (>= 0.1.1 < 0.2)
-    Aardvark.Base.Essentials (3.0.42)
-      Aardvark.Base (>= 3.0.42)
+    Aardvark.Base.Essentials (3.0.44)
+      Aardvark.Base (>= 3.0.44)
       DevILSharp (>= 0.1.1 < 0.2)
       System.Collections.Immutable (>= 1.2)
       System.Reactive.Linq (>= 3.0 < 3.1)
-    Aardvark.Base.FSharp (3.0.42)
-      Aardvark.Base (>= 3.0.42)
+    Aardvark.Base.FSharp (3.0.44)
+      Aardvark.Base (>= 3.0.44)
       DevILSharp (>= 0.1.1 < 0.2)
       FSharp.Core (>= 4.0 < 4.1)
-    Aardvark.Base.Incremental (3.0.42)
-      Aardvark.Base (>= 3.0.42)
-      Aardvark.Base.Essentials (>= 3.0.42)
-      Aardvark.Base.FSharp (>= 3.0.42)
+    Aardvark.Base.Incremental (3.0.44)
+      Aardvark.Base (>= 3.0.44)
+      Aardvark.Base.Essentials (>= 3.0.44)
+      Aardvark.Base.FSharp (>= 3.0.44)
       DevILSharp (>= 0.1.1 < 0.2)
       FSharp.Core (>= 4.0 < 4.1)
       System.Reactive.Core (>= 3.0 < 3.1)
@@ -95,40 +95,41 @@ NUGET
       System.Reactive.Core (>= 3.0 < 3.1)
       System.Reactive.Interfaces (>= 3.0 < 3.1)
       System.Reactive.Linq (>= 3.0 < 3.1)
-    FShade (3.3.5)
-      FShade.Core (3.3.5)
-      FShade.GLSL (3.3.5)
-      FShade.Imperative (3.3.5)
-      FShade.SpirV (3.3.5)
-    FShade.Core (3.3.5)
+    FShade (3.3.7)
+      FShade.Core (3.3.7)
+      FShade.GLSL (3.3.7)
+      FShade.Imperative (3.3.7)
+      FShade.SpirV (3.3.7)
+    FShade.Core (3.3.7)
       Aardvark.Base (>= 3.0.36 < 3.1)
       Aardvark.Base.FSharp (>= 3.0.36 < 3.1)
-      FShade.Imperative (>= 3.3.5)
+      FShade.Imperative (>= 3.3.7)
       FSharp.Core (>= 4.0 < 4.1)
-    FShade.Debug (3.3.5)
+    FShade.Debug (3.3.7)
       Aardvark.Base (>= 3.0.36 < 3.1)
       Aardvark.Base.FSharp (>= 3.0.36 < 3.1)
       Aardvark.Base.Incremental (>= 3.0.36 < 3.1)
-      FShade.Core (>= 3.3.5)
-      FShade.Imperative (>= 3.3.5)
+      FShade.Core (>= 3.3.7)
+      FShade.GLSL (>= 3.3.7)
+      FShade.Imperative (>= 3.3.7)
       FSharp.Compiler.Service (>= 9.0.1 < 9.1)
       FSharp.Core (>= 4.0 < 4.1)
-    FShade.GLSL (3.3.5)
+    FShade.GLSL (3.3.7)
       Aardvark.Base (>= 3.0.36 < 3.1)
       Aardvark.Base.FSharp (>= 3.0.36 < 3.1)
-      FShade.Core (>= 3.3.5)
-      FShade.Imperative (>= 3.3.5)
+      FShade.Core (>= 3.3.7)
+      FShade.Imperative (>= 3.3.7)
       FSharp.Core (>= 4.0 < 4.1)
-    FShade.Imperative (3.3.5)
+    FShade.Imperative (3.3.7)
       Aardvark.Base (>= 3.0.36 < 3.1)
       Aardvark.Base.FSharp (>= 3.0.36 < 3.1)
       FSharp.Core (>= 4.0 < 4.1)
       FsPickler (>= 4.0 < 4.1)
-    FShade.SpirV (3.3.5)
+    FShade.SpirV (3.3.7)
       Aardvark.Base (>= 3.0.36 < 3.1)
       Aardvark.Base.FSharp (>= 3.0.36 < 3.1)
-      FShade.Core (>= 3.3.5)
-      FShade.Imperative (>= 3.3.5)
+      FShade.Core (>= 3.3.7)
+      FShade.Imperative (>= 3.3.7)
       FSharp.Core (>= 4.0 < 4.1)
     GLSLangSharp (0.3.8)
       Aardvark.Base (>= 3.0.35)

diff --git a/src/Aardvark.Rendering.Vulkan/Resources/ShaderProgram.fs b/src/Aardvark.Rendering.Vulkan/Resources/ShaderProgram.fs
@@ -373,6 +373,14 @@ type ContextShaderProgramExtensions private() =
             | :? BackendSurface as bs -> this |> ShaderProgram.ofBackendSurface bs
             | :? IGeneratedSurface as gs ->
                 let bs = gs.Generate(this.Runtime, signature) 
+
+                if FShade.EffectDebugger.isAttached then
+                    match gs with
+                        | :? FShadeSurface as fs ->
+                            FShade.EffectDebugger.saveCode fs.Effect bs.Code
+                        | _ ->
+                            ()
+
                 this |> ShaderProgram.ofBackendSurface bs
             | _ ->
                 failf "bad surface type: %A" surface

diff --git a/src/Demo/Scratch/Scratch.fsproj b/src/Demo/Scratch/Scratch.fsproj
@@ -91,9 +91,6 @@
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Compiler.Service">
-      <HintPath>..\..\..\lib\Release\FSharp.Compiler.Service.dll</HintPath>
-    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="OpenTK">
       <HintPath>..\..\..\lib\Release\OpenTK.dll</HintPath>
@@ -104,9 +101,6 @@
     <Reference Include="OpenTK.GLControl">
       <HintPath>..\..\..\lib\Release\OpenTK.GLControl.dll</HintPath>
     </Reference>
-    <Reference Include="QuotationCompiler">
-      <HintPath>..\..\..\lib\Release\QuotationCompiler.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
@@ -281,6 +275,22 @@
       </ItemGroup>
     </When>
   </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+      <ItemGroup>
+        <Reference Include="FSharp.Compiler.Service">
+          <HintPath>..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="FSharp.Compiler.Service.MSBuild.v12">
+          <HintPath>..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
       <ItemGroup>
@@ -364,6 +374,17 @@
       </ItemGroup>
     </When>
   </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+      <ItemGroup>
+        <Reference Include="System.Reflection.Metadata">
+          <HintPath>..\..\..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
       <ItemGroup>