Skip to content

Commit 10a7935

Browse files
chaosnhatredchaosnhatred
committed
stabilized d3d12 rendering
stabilized d3d12 rendering. NEEDS EXTREME OPTIMIZATION
1 parent 440a541 commit 10a7935

195 files changed

Lines changed: 9426 additions & 2194 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Patchwork.Framework.Dotnet.favdoc‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Patchwork.Framework.Dotnet.sln‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1818
src\GlobalSuppressions.cs = src\GlobalSuppressions.cs
1919
ImportsNon.Build.props = ImportsNon.Build.props
2020
LICENSE.md = LICENSE.md
21+
snippets\patchwork.snippets.txt = snippets\patchwork.snippets.txt
2122
README.md = README.md
2223
SECURITY.md = SECURITY.md
2324
src\SharedAssemblyInfo.cs = src\SharedAssemblyInfo.cs
@@ -95,6 +96,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net6.Windows", "src\Net6\Ne
9596
EndProject
9697
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsApp-Net6", "samples\WindowsApp-Net6\WindowsApp-Net6.csproj", "{B870805D-46D1-4690-8EDA-2B3624B1D1C1}"
9798
EndProject
99+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Snippets", "Snippets", "{BF2ABA49-4391-4F98-8793-D3300C4AD20B}"
100+
ProjectSection(SolutionItems) = preProject
101+
snippets\vortice-usings.snippet = snippets\vortice-usings.snippet
102+
EndProjectSection
103+
EndProject
98104
Global
99105
GlobalSection(SolutionConfigurationPlatforms) = preSolution
100106
Debug|Android = Debug|Android
@@ -255,6 +261,7 @@ Global
255261
{DCDB29B0-16A7-4FC1-B38D-777B046D5A73} = {1AA6EAB9-9D97-4FD8-BDF0-84E8D7F7BFBE}
256262
{2C888852-E914-4AB4-904D-4EE959200233} = {1AA6EAB9-9D97-4FD8-BDF0-84E8D7F7BFBE}
257263
{B870805D-46D1-4690-8EDA-2B3624B1D1C1} = {B013D504-A2C9-4216-A4A1-EB7BC9588F3A}
264+
{BF2ABA49-4391-4F98-8793-D3300C4AD20B} = {2E0F2A5F-45F7-4023-BF7A-143D0031B90E}
258265
EndGlobalSection
259266
GlobalSection(ExtensibilityGlobals) = postSolution
260267
SolutionGuid = {A53841F6-1E2B-46A5-82DE-2A2FF30168E4}
@@ -292,6 +299,12 @@ Global
292299
src\Patchwork.Framework.Display\Patchwork.Framework.Display.projitems*{8262adec-5c8c-4270-996f-b352ad34d163}*SharedItemsImports = 13
293300
src\Platform\Patchwork.Framework.Linux\Patchwork.Framework.Linux.projitems*{c6806c4e-c4e9-4736-ac25-300cd08b244c}*SharedItemsImports = 13
294301
src\System.Drawing\System.Drawing.projitems*{dc0efc52-d116-4c15-a296-2eca1a62479e}*SharedItemsImports = 13
302+
src\Patchwork.Framework.Display\Patchwork.Framework.Display.projitems*{dcdb29b0-16a7-4fc1-b38d-777b046d5a73}*SharedItemsImports = 5
303+
src\Patchwork.Framework.Rendering\Patchwork.Framework.Rendering.projitems*{dcdb29b0-16a7-4fc1-b38d-777b046d5a73}*SharedItemsImports = 5
304+
src\Patchwork.Framework.Windowing\Patchwork.Framework.Windowing.projitems*{dcdb29b0-16a7-4fc1-b38d-777b046d5a73}*SharedItemsImports = 5
305+
src\Patchwork.Framework\Patchwork.Framework.projitems*{dcdb29b0-16a7-4fc1-b38d-777b046d5a73}*SharedItemsImports = 5
306+
src\Platform\Patchwork.Framework.Android\Patchwork.Framework.Android.projitems*{dcdb29b0-16a7-4fc1-b38d-777b046d5a73}*SharedItemsImports = 5
307+
src\Platform\Patchwork.Framework.Desktop\Patchwork.Framework.Desktop.projitems*{dcdb29b0-16a7-4fc1-b38d-777b046d5a73}*SharedItemsImports = 5
295308
src\Patchwork.Framework\Patchwork.Framework.projitems*{dff5f575-ace9-41ce-89a9-e82d0dc8ca6c}*SharedItemsImports = 13
296309
src\Patchwork.Framework.Display\Patchwork.Framework.Display.projitems*{e369dda2-26d2-4558-943d-303306f80a53}*SharedItemsImports = 5
297310
src\Patchwork.Framework.Rendering\Patchwork.Framework.Rendering.projitems*{e369dda2-26d2-4558-943d-303306f80a53}*SharedItemsImports = 5

‎Patchwork.Framework.Dotnet.sln.DotSettings‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,16 @@ Throw.If($EXPR$)</s:String>
508508
<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=ECB4E947F505D14186440428C5BC5E13/Text/@EntryValue">protected abstract $type$ PlatformGet$object$();
509509

510510
protected abstract void PlatformSet$object$($type$ value);</s:String>
511+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Backbuffer/@EntryIndexedValue">True</s:Boolean>
512+
<s:Boolean x:Key="/Default/UserDictionary/Words/=DXGI/@EntryIndexedValue">True</s:Boolean>
513+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Hwnd/@EntryIndexedValue">True</s:Boolean>
511514
<s:Boolean x:Key="/Default/UserDictionary/Words/=Longacre/@EntryIndexedValue">True</s:Boolean>
512515
<s:Boolean x:Key="/Default/UserDictionary/Words/=nuspec/@EntryIndexedValue">True</s:Boolean>
513516
<s:Boolean x:Key="/Default/UserDictionary/Words/=Renderers/@EntryIndexedValue">True</s:Boolean>
514517
<s:Boolean x:Key="/Default/UserDictionary/Words/=Skia/@EntryIndexedValue">True</s:Boolean>
518+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Swapchain/@EntryIndexedValue">True</s:Boolean>
519+
<s:Boolean x:Key="/Default/UserDictionary/Words/=VDXGI/@EntryIndexedValue">True</s:Boolean>
515520

516521

517-
<s:Boolean x:Key="/Default/UserDictionary/Words/=Virutal/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
522+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Virutal/@EntryIndexedValue">True</s:Boolean>
523+
<s:Boolean x:Key="/Default/UserDictionary/Words/=Vortice/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎samples/AndroidApp-Net5/Resources/Resource.designer.cs‎

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/WindowsApp-Net6/Program.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Patchwork.Framework;
55
using Patchwork.Framework.Manager;
66
using Patchwork.Framework.Messaging;
7-
using Shield.Framework.IoC.Native.DependencyInjection;
87
using Shin.Framework.Logging.Loggers;
98
using Shin.Framework.Logging.Native;
109
#endregion
@@ -22,6 +21,7 @@ internal class Program
2221
private static void Main(string[] args)
2322
{
2423
var log = new Logger();
24+
log.QueueSize = 1;
2525
log.Initialize();
2626
log.AddLogProvider(new ConsoleLogger());
2727

@@ -35,26 +35,26 @@ private static void Main(string[] args)
3535

3636
Core.Window.CreateWindow().Show();
3737
Core.Run(m_cts.Token);
38+
//Core.Logger.LogNone("Press any key to exit.");
39+
//while (!Console.KeyAvailable)
40+
//{
41+
// Core.Logger.LogNone(".");
42+
// Thread.Sleep(250);
43+
//}
3844

3945
Core.Dispose();
4046
Core.CloseConsole();
4147
}
4248

4349
private static void OnStartup() { }
4450

45-
private static void OnShutdown()
46-
{
47-
Core.Logger.LogNone("Press any key to exit.");
48-
while (!Console.KeyAvailable)
49-
{
50-
Core.Logger.LogNone(".");
51-
Thread.Sleep(250);
52-
}
53-
}
51+
private static void OnShutdown() { }
5452

5553
private static void OnMessage(IPlatformMessage message)
5654
{
5755
Core.Logger.LogDebug("Message type: " + message.Id);
56+
//Core.Logger.LogDebug("--Message sub type: " + message.RawData?.MessageId);
57+
5858
switch (message.Id)
5959
{
6060
case MessageIds.Window:

‎samples/WindowsApp-Net6/WindowsApp-Net6.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
65
<RootNamespace>WindowsApp.Net6</RootNamespace>
76
<ImplicitUsings>enable</ImplicitUsings>
87
<Nullable>enable</Nullable>
8+
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
9+
<StartupObject>WindowsApp.Program</StartupObject>
10+
<TargetFramework>net6.0-windows</TargetFramework>
911
</PropertyGroup>
1012

1113
<ItemGroup>

‎snippets/vortice-usings.snippet‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<CodeSnippets xmlns="http://schemas.microsoft.com/VisualStudio/2005/CodeSnippet">
3+
<CodeSnippet Format="1.0.0">
4+
<Header>
5+
<Title>Vortice Usings</Title>
6+
<Author>Bryan M. Longacre</Author>
7+
<Description>Import All Vortice Usings.</Description>
8+
<Shortcut>vortice-usings</Shortcut>
9+
</Header>
10+
<Snippet>
11+
<Code Language="CSharp">
12+
<![CDATA[]]>
13+
</Code>
14+
<Imports>
15+
<Import>
16+
<Namespace>VD3D = Vortice.Direct3D</Namespace>
17+
</Import>
18+
<Import>
19+
<Namespace>VD2D1 = Vortice.Direct2D1</Namespace>
20+
</Import>
21+
<Import>
22+
<Namespace>VD3D11 = Vortice.Direct3D11</Namespace>
23+
</Import>
24+
<Import>
25+
<Namespace>VD3D12 = Vortice.Direct3D12</Namespace>
26+
</Import>
27+
<Import>
28+
<Namespace>VDXGI = Vortice.DXGI</Namespace>
29+
</Import>
30+
<Import>
31+
<Namespace>VD3D11on12 = Vortice.Direct3D11on12</Namespace>
32+
</Import>
33+
</Imports>
34+
</Snippet>
35+
</CodeSnippet>
36+
</CodeSnippets>

‎src/Imports.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@
144144
<Import Project="$(SkiaImportFile)" Label="Shared" />
145145
</ImportGroup>-->
146146

147-
<ItemGroup>
147+
<!--<ItemGroup>
148148
<PackageReference Include="Shin.Framework" Version="0.1.1-preview" />
149-
</ItemGroup>
149+
</ItemGroup>-->
150150
<Choose>
151151
<When Condition="'$(Rendering)' == 'true'">
152152
<ItemGroup>

‎src/Imports.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@
145145
</ImportGroup>-->
146146

147147
<ItemGroup>
148-
<PackageReference Include="Shin.Framework" Version="0.1.3-preview" />
148+
<PackageReference Include="Shin.Framework" Version="0.1.6-beta-build10" />
149149
</ItemGroup>
150150
<Choose>
151151
<When Condition="'$(Rendering)' == 'true'">
152152
<ItemGroup>
153-
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
153+
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
154154
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
155155
</ItemGroup>
156156
<Choose>

‎src/Net5/Net5.Android/Resources/Resource.designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)