Browse Source

Upgraded packages and removed dynamic shader compilation

flabbet 2 years ago
parent
commit
ebb35235ba

+ 7 - 3
src/ChunkyImageLib/ChunkyImageLib.csproj

@@ -9,9 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ComputeSharp.Core" Version="2.0.0-alpha.28" />
-    <PackageReference Include="ComputeSharp.Dynamic" Version="2.0.0-alpha.28" />
-    <PackageReference Include="OneOf" Version="3.0.216" />
+    <PackageReference Include="ComputeSharp" Version="2.0.0-preview2" />
+    <PackageReference Include="ComputeSharp.Core" Version="2.0.0-preview2" />
+    <PackageReference Include="OneOf" Version="3.0.223" />
+    <PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.435">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

+ 0 - 1
src/ChunkyImageLib/DataHolders/ColorBounds.cs

@@ -57,7 +57,6 @@ public struct ColorBounds
         return true;
     }
     
-    [ShaderMethod]
     public readonly bool IsWithinBounds(Float4 color)
     {
         float r = color.R;

+ 1 - 1
src/ChunkyImageLib/Operations/ReplaceColorOperation.cs

@@ -40,7 +40,7 @@ internal class ReplaceColorOperation : IDrawOperation
 
         UInt2 packedColor = ShaderUtils.PackPixel(newColor);
         
-        GraphicsDevice.GetDefault().For(texture.Width, texture.Height, 
+        GraphicsDevice.GetDefault().For(texture.Width, texture.Height, 1,  8, 8, 1,
             new ReplaceColorShader(
                 texture,
                 oldColorBounds,

+ 1 - 0
src/ChunkyImageLib/Shaders/ReplaceColorShader.cs

@@ -3,6 +3,7 @@
 namespace ChunkyImageLib.Shaders;
 
 [AutoConstructor]
+[EmbeddedBytecode(8, 8, 1)]
 internal readonly partial struct ReplaceColorShader : IComputeShader
 {
     public readonly ReadWriteTexture2D<UInt2> texture;

+ 7 - 0
src/PixiEditor.Zoombox/PixiEditor.Zoombox.csproj

@@ -11,4 +11,11 @@
     <ProjectReference Include="..\ChunkyImageLib\ChunkyImageLib.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.435">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

+ 12 - 8
src/PixiEditor/PixiEditor.csproj

@@ -207,22 +207,26 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="CLSEncoderDecoder" Version="1.0.0" />
-		<PackageReference Include="Dirkster.AvalonDock" Version="4.70.1" />
+		<PackageReference Include="Dirkster.AvalonDock" Version="4.70.3" />
 		<PackageReference Include="ByteSize" Version="2.1.1" />
-		<PackageReference Include="DiscordRichPresence" Version="1.0.175" />
-		<PackageReference Include="Hardware.Info" Version="10.0.0" />
-		<PackageReference Include="MessagePack" Version="2.3.85" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-		<PackageReference Include="OneOf" Version="3.0.216" />
+		<PackageReference Include="DiscordRichPresence" Version="1.1.1.14" />
+		<PackageReference Include="Hardware.Info" Version="10.1.0" />
+		<PackageReference Include="MessagePack" Version="2.4.35" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta2" />
+		<PackageReference Include="OneOf" Version="3.0.223" />
 		<PackageReference Include="PixiEditor.ColorPicker" Version="3.3.1" />
 		<PackageReference Include="PixiEditor.Parser" Version="3.0.0" />
 		<PackageReference Include="PixiEditor.Parser.Skia" Version="3.0.0" />
-		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
 		<PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
 		<PackageReference Include="WriteableBitmapEx">
 			<Version>1.6.8</Version>
 		</PackageReference>
+		<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.435">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="Images\AnchorDot.png" />