Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a PAL for D3D12 #492

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<TargetFramework>net6.0</TargetFramework>
<!-- <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> -->
<RootNamespace>ComputeSharp.SwapChain.WinUI</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x64;arm64</Platforms>
Expand Down Expand Up @@ -36,7 +36,7 @@
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

<!--
<!--
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
Tools extension to be activated for this project even if the Windows App SDK Nuget
package has not yet been restored.
Expand All @@ -45,9 +45,9 @@
<ProjectCapability Include="Msix" />
</ItemGroup>

<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Explorer "Package and Publish" context menu entry to be enabled for this project even if
<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Explorer "Package and Publish" context menu entry to be enabled for this project even if
the Windows App SDK Nuget package has not yet been restored.
-->
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp.D2D1/ComputeSharp.D2D1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<OutputPath>bin\Release</OutputPath>
<DocumentationFile>ComputeSharp.D2D1.xml</DocumentationFile>
<SupportedOSVersion>windows6.1</SupportedOSVersion>
<!-- <SupportedOSVersion>windows6.1</SupportedOSVersion> -->
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp.Dynamic/ComputeSharp.Dynamic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputPath>bin\Release</OutputPath>
<DocumentationFile>ComputeSharp.Dynamic.xml</DocumentationFile>
<Platforms>AnyCPU;x64;ARM64</Platforms>
<SupportedOSVersion>windows6.2</SupportedOSVersion>
<!-- <SupportedOSVersion>windows6.2</SupportedOSVersion> -->
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp.Pix/ComputeSharp.Pix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputPath>bin\Release</OutputPath>
<DocumentationFile>ComputeSharp.Pix.xml</DocumentationFile>
<Platforms>AnyCPU;x64;ARM64</Platforms>
<SupportedOSVersion>windows6.2</SupportedOSVersion>
<!-- <SupportedOSVersion>windows6.2</SupportedOSVersion> -->
</PropertyGroup>

<!-- Reference to the main library-->
Expand Down
4 changes: 2 additions & 2 deletions src/ComputeSharp.WinUI/ComputeSharp.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<TargetFramework>net6.0</TargetFramework>
<!-- <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> -->
<RootNamespace>ComputeSharp.WinUI</RootNamespace>
<Platforms>x64;ARM64</Platforms>
<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
Expand Down
2 changes: 1 addition & 1 deletion src/ComputeSharp/ComputeSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<OutputPath>bin\Release</OutputPath>
<DocumentationFile>ComputeSharp.xml</DocumentationFile>
<SupportedOSVersion>windows6.2</SupportedOSVersion>
<!-- <SupportedOSVersion>windows6.2</SupportedOSVersion> -->
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace ComputeSharp;

/// <inheritdoc/>
unsafe partial class GraphicsDevice
unsafe partial class D3D12GraphicsDevice
{
#if !NET6_0_OR_GREATER
/// <summary>
Expand All @@ -24,7 +24,7 @@ unsafe partial class GraphicsDevice
/// </summary>
/// <exception cref="InvalidOperationException">Thrown if the current device has been lost.</exception>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal void ThrowIfDeviceLost()
internal override void ThrowIfDeviceLost()
{
// This method is called as a check before performing any operations. In order to minimize overhead,
// the GetDeviceRemovedReason() method is not called here, and the local field is just used instead.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
namespace ComputeSharp;

/// <inheritdoc/>
unsafe partial class GraphicsDevice
unsafe partial class D3D12GraphicsDevice
{
#if !NET6_0_OR_GREATER
/// <summary>
Expand Down Expand Up @@ -175,7 +175,7 @@ private struct CallbackContext
/// <remarks>This method is only supported for compute operations.</remarks>
private static WaitForFenceValueTaskSource WaitForFenceAsync(
ulong d3D12FenceValue,
GraphicsDevice device,
D3D12GraphicsDevice device,
ID3D12GraphicsCommandList* d3D12GraphicsCommandList,
ID3D12CommandAllocator* d3D12CommandAllocator)
{
Expand Down Expand Up @@ -232,7 +232,7 @@ private static void WaitForSingleObjectCallbackForWaitForFenceAsync(void* pConte
CallbackContext* callbackContext = (CallbackContext*)pContext;

WaitForFenceValueTaskSource waitForFenceValueTaskSource = Unsafe.As<WaitForFenceValueTaskSource>(callbackContext->WaitForFenceValueTaskSourceHandle.Target)!;
GraphicsDevice device = Unsafe.As<GraphicsDevice>(callbackContext->GraphicsDeviceHandle.Target)!;
D3D12GraphicsDevice device = Unsafe.As<D3D12GraphicsDevice>(callbackContext->GraphicsDeviceHandle.Target)!;
ID3D12GraphicsCommandList* d3D12GraphicsCommandList = callbackContext->D3D12GraphicsCommandList;
ID3D12CommandAllocator* d3D12CommandAllocator = callbackContext->D3D12CommandAllocator;
HANDLE eventHandle = callbackContext->EventHandle;
Expand Down
Loading