diff --git a/samples/ComputeSharp.SwapChain.Cli/ComputeSharp.SwapChain.Cli.csproj b/samples/ComputeSharp.SwapChain.Cli/ComputeSharp.SwapChain.Cli.csproj index 5be6880aa..de9076d80 100644 --- a/samples/ComputeSharp.SwapChain.Cli/ComputeSharp.SwapChain.Cli.csproj +++ b/samples/ComputeSharp.SwapChain.Cli/ComputeSharp.SwapChain.Cli.csproj @@ -42,7 +42,7 @@ - + diff --git a/src/ComputeSharp/ComputeSharp.targets b/src/ComputeSharp/ComputeSharp.targets index 991faa81f..f34b0f9d3 100644 --- a/src/ComputeSharp/ComputeSharp.targets +++ b/src/ComputeSharp/ComputeSharp.targets @@ -72,10 +72,10 @@ Value="$(ComputeSharpEnableDeviceRemovedExtendedData)" Trim="true" /> - - + diff --git a/src/ComputeSharp/Graphics/Extensions/Interop/ID3D12DeviceExtensions.cs b/src/ComputeSharp/Graphics/Extensions/Interop/ID3D12DeviceExtensions.cs index 75fbfe4ed..a67071134 100644 --- a/src/ComputeSharp/Graphics/Extensions/Interop/ID3D12DeviceExtensions.cs +++ b/src/ComputeSharp/Graphics/Extensions/Interop/ID3D12DeviceExtensions.cs @@ -356,7 +356,7 @@ public static ComPtr CreateCommandQueue(this ref ID3D12Devic d3D12CommandQueueDesc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; d3D12CommandQueueDesc.NodeMask = 0; - if (Configuration.IsGpuTimeoutDisabled) + if (!Configuration.IsGpuTimeoutEnabled) { d3D12CommandQueueDesc.Flags |= D3D12_COMMAND_QUEUE_FLAG_DISABLE_GPU_TIMEOUT; } diff --git a/src/ComputeSharp/Properties/Configuration.cs b/src/ComputeSharp/Properties/Configuration.cs index 4ed1e4b77..dc56237cc 100644 --- a/src/ComputeSharp/Properties/Configuration.cs +++ b/src/ComputeSharp/Properties/Configuration.cs @@ -30,9 +30,9 @@ internal static class Configuration private const string IsDeviceRemovedExtendedDataEnabledPropertyName = "COMPUTESHARP_ENABLE_DEVICE_REMOVED_EXTENDED_DATA"; /// - /// The configuration property name for . + /// The configuration property name for . /// - private const string IsGpuTimeoutDisabledPropertyName = "COMPUTESHARP_DISABLE_GPU_TIMEOUT"; + private const string IsGpuTimeoutEnabledPropertyName = "COMPUTESHARP_ENABLE_GPU_TIMEOUT"; /// /// The backing field for . @@ -45,9 +45,9 @@ internal static class Configuration private static int isDeviceRemovedExtendedDataEnabledConfigurationValue; /// - /// The backing field for . + /// The backing field for . /// - private static int isGpuTimeoutDisabledConfigurationValue; + private static int isGpuTimeoutEnabledConfigurationValue; /// /// Gets a value indicating whether or not the debug output is enabled (defaults to ). @@ -68,12 +68,12 @@ public static bool IsDeviceRemovedExtendedDataEnabled } /// - /// Gets a value indicating whether or not the GPU timeout is disabled (defaults to ). + /// Gets a value indicating whether or not the GPU timeout is enabled (defaults to ). /// - public static bool IsGpuTimeoutDisabled + public static bool IsGpuTimeoutEnabled { [MethodImpl(MethodImplOptions.AggressiveInlining)] - get => GetConfigurationValue(IsGpuTimeoutDisabledPropertyName, ref isGpuTimeoutDisabledConfigurationValue); + get => GetConfigurationValue(IsGpuTimeoutEnabledPropertyName, ref isGpuTimeoutEnabledConfigurationValue); } /// @@ -140,10 +140,10 @@ private static bool GetDefaultConfigurationValue(string propertyName) #endif } - // Disable GPU timeout (always false by default) - if (propertyName == IsGpuTimeoutDisabledPropertyName) + // GPU timeout (always enabled by default, disabling it is only recommended for debugging purposes) + if (propertyName == IsGpuTimeoutEnabledPropertyName) { - return false; + return true; } return false; diff --git a/src/ComputeSharp/Properties/ILLink.Substitutions.xml b/src/ComputeSharp/Properties/ILLink.Substitutions.xml index 3885337c2..e9fb51bb3 100644 --- a/src/ComputeSharp/Properties/ILLink.Substitutions.xml +++ b/src/ComputeSharp/Properties/ILLink.Substitutions.xml @@ -10,9 +10,9 @@ - - - + + + \ No newline at end of file