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.

Sign up for GitHub

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

Jump to bottom

[Fix] Remove D3D12 warning messages at exit #117

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[Fix] Remove D3D12 warning messages at exit #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a11951b
Fix D3D12 warning messages at exit
Benualdo Oct 9, 2020
cc87083
OPTICK_GPU_EVENT_DYNAMIC
Benualdo Oct 17, 2020
be01ae5
Fix memory leaks with gpuProfiler and symbolEngine
Benualdo Oct 18, 2020
0e1287e
Clean
Benualdo Oct 18, 2020
3b8700f
Fix memory leak during capture
Benualdo Jul 23, 2023
2d85a0d
C++20 compile fix
Benualdo Sep 3, 2024
74b21f5
Use new .NET SDK
jairbubbles Sep 28, 2024
d2f5957
Remove packages.config
jairbubbles Sep 28, 2024
ce19257
Merge pull request #1 from vimontgames/useNewSdk
Benualdo Oct 19, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ Publish/
/Samples/UnrealEnginePlugin/Binaries
/.vs
/samples/UnrealEnginePlugin/GUI/Optick.exe
.idea/
Binary file removed gui/AutoEmbedLibs/SharpDX.D3DCompiler.dll
View file
Open in desktop
Binary file not shown.
Binary file removed gui/AutoEmbedLibs/SharpDX.DXGI.dll
View file
Open in desktop
Binary file not shown.
Binary file removed gui/AutoEmbedLibs/SharpDX.Direct2D1.dll
View file
Open in desktop
Binary file not shown.
Binary file removed gui/AutoEmbedLibs/SharpDX.Direct3D11.dll
View file
Open in desktop
Binary file not shown.
Binary file removed gui/AutoEmbedLibs/SharpDX.dll
View file
Open in desktop
Binary file not shown.
Binary file removed gui/AutoEmbedLibs/System.Windows.Interactivity.dll
View file
Open in desktop
Binary file not shown.
97 changes: 23 additions & 74 deletions gui/InteractiveDataDisplay.WPF/InteractiveDataDisplay.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2D34544C-2DF2-4B20-A43A-6C8D2DF3DD82}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>InteractiveDataDisplay.WPF</RootNamespace>
<AssemblyName>InteractiveDataDisplay.WPF</AssemblyName>
<TargetFrameworks>net452;net46</TargetFrameworks>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETFRAMEWORK;NETFRAMEWORK;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;RELEASE;NETFRAMEWORK;;RELEASE;NETFRAMEWORK;RELEASE;NETFRAMEWORK;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<LanguageTargets Condition="Exists('$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets')">$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
<Version>1.1.0</Version>
<Company>Microsoft; MSU ITIS Lab</Company>
<Authors>Sergey Berezin, Vassily Lyutsarev, Nikita Skoblov, Natalia Stepanova</Authors>
<Description>Interactive Data Display for WPF is a set of controls for adding interactive visualization of dynamic data to your application.</Description>
<Copyright>Copyright 2017 Microsoft Corporation</Copyright>
<PackageTags>idd wpf visualization plot plots plotting chart charting data interactive datavisualization</PackageTags>
<PackageProjectUrl>https://github.com/Microsoft/InteractiveDataDisplay.WPF</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/Microsoft/InteractiveDataDisplay.WPF/blob/master/LICENSE</PackageLicenseUrl>
</PropertyGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net472</TargetFramework>
<UseWpf>true</UseWpf>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<Version>1.1.0</Version>
<Company>Microsoft; MSU ITIS Lab</Company>
<Authors>Sergey Berezin, Vassily Lyutsarev, Nikita Skoblov, Natalia Stepanova</Authors>
<Description>Interactive Data Display for WPF is a set of controls for adding interactive visualization of dynamic data to your application.</Description>
<Copyright>Copyright 2017 Microsoft Corporation</Copyright>
<PackageTags>idd wpf visualization plot plots plotting chart charting data interactive datavisualization</PackageTags>
<PackageProjectUrl>https://github.com/Microsoft/InteractiveDataDisplay.WPF</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/Microsoft/InteractiveDataDisplay.WPF/blob/master/LICENSE</PackageLicenseUrl>
</PropertyGroup>
<PropertyGroup>
<NoWarn>CS0108</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Windows" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<!-- XAML elements -->
<!-- Workaround to make xamls appear in the VS solution explorer -->
<None Include="**\*.xaml" />
<Page Include="**\*.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Compile Update="**\*.xaml.cs" SubType="Code" DependentUpon="%(Filename)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maps.MapControl.WPF" Version="1.0.0.3" />
<PackageReference Include="System.Reactive" Version="3.1.1" Condition=" '$(TargetFramework)' == 'net452' " />
<PackageReference Include="System.Reactive" Version="4.0.0" Condition=" '$(TargetFramework)' == 'net46' " />
</ItemGroup>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maps.MapControl.WPF" Version="1.0.0.3" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>
</Project>
60 changes: 26 additions & 34 deletions gui/Optick/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
using System;
using System.Windows;
using System.Reflection;
using System.IO;
using System.Diagnostics;
using Sentry;

namespace Profiler
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{

static App()
{

}

protected override void OnStartup(StartupEventArgs e)
{
using System;
using System.Windows;
using System.Reflection;
using System.IO;
using System.Diagnostics;

namespace Profiler
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{

static App()
{

}

protected override void OnStartup(StartupEventArgs e)
{
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
base.OnStartup(e);
base.OnStartup(e);
}

private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
Expand All @@ -41,16 +40,9 @@ bool ReportError(Exception ex)

while (rootException.InnerException != null)
rootException = rootException.InnerException;

if (MessageBox.Show("Unhandled Exception:\n" + rootException.ToString(), "Optick Crashed! Send report?", MessageBoxButton.OKCancel, MessageBoxImage.Error) == MessageBoxResult.OK)
{
using (SentrySdk.Init("https://[email protected]/1493349"))
{
SentrySdk.CaptureException(rootException);
}
return true;
}

MessageBox.Show(rootException.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
return false;
}
}
}
}
}
Loading