danwalmsley
9 years ago
committed by
GitHub
GitHub
52 changed files with 461 additions and 211 deletions
Binary file not shown.
@ -1,67 +0,0 @@ |
|||
<?xml version="1.0" encoding="utf-8"?> |
|||
<!-- |
|||
This file is for a workaround for this NuGet issue https://github.com/NuGet/Home/issues/4532 |
|||
It is built from the master branch of NuGet.BuildTasks with a different class name as not to conflict with the original. |
|||
It can most likely be removed when the next version of NuGet.BuildTasks is released: https://github.com/NuGet/NuGet.BuildTasks/pull/29 |
|||
--> |
|||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|||
<UsingTask TaskName="Microsoft.NuGet.Build.Tasks.ResolveNuGetPackageAssetsPatched" AssemblyFile="Microsoft.NuGet.Build.Tasks.Patched.dll" /> |
|||
|
|||
<Target Name="ResolveNuGetPackageAssets" |
|||
DependsOnTargets="$(ResolveNuGetPackageAssetsDependsOn)" |
|||
Condition="'$(ResolveNuGetPackages)' == 'true' and exists('$(ProjectLockFile)')"> |
|||
|
|||
<ResolveNuGetPackageAssetsPatched AllowFallbackOnTargetSelection="$(DesignTimeBuild)" |
|||
ContinueOnError="$(ContinueOnError)" |
|||
IncludeFrameworkReferences="$(IncludeFrameworkReferencesFromNuGet)" |
|||
NuGetPackagesDirectory="$(NuGetPackagesDirectory)" |
|||
RuntimeIdentifier="$(NuGetRuntimeIdentifier)" |
|||
ProjectLanguage="$(Language)" |
|||
ProjectLockFile="$(ProjectLockFile)" |
|||
ContentPreprocessorValues="@(NuGetPreprocessorValue)" |
|||
ContentPreprocessorOutputDirectory="$(IntermediateOutputPath)\NuGet" |
|||
TargetMonikers="$(NuGetTargetMoniker);$(_NuGetTargetFallbackMoniker)"> |
|||
|
|||
<Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> |
|||
<Output TaskParameter="ResolvedCopyLocalItems" ItemName="ReferenceCopyLocalPaths" /> |
|||
<Output TaskParameter="ResolvedReferences" ItemName="_ReferencesFromNuGetPackages" /> |
|||
<Output TaskParameter="ReferencedPackages" ItemName="ReferencedNuGetPackages" /> |
|||
<Output TaskParameter="ContentItems" ItemName="_NuGetContentItems" /> |
|||
<Output TaskParameter="FileWrites" ItemName="FileWrites" /> |
|||
</ResolveNuGetPackageAssetsPatched> |
|||
|
|||
<ItemGroup> |
|||
<!-- Remove exact references, such as if a package had a framework reference to 'System' that we already have --> |
|||
<Reference Remove="@(_ReferencesFromNuGetPackages)" /> |
|||
|
|||
<!-- Remove simple name references that are already implicitly added --> |
|||
<_ReferencesFromNuGetPackages Remove="%(ReferencePath.FileName)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'" /> |
|||
|
|||
<!-- Include NuGet references in the proper groups. Project-to-project references must go in the |
|||
_ResolvedProjectReferencePaths group which matches the behavior of the ResolveProjectReferences |
|||
target. This ensures that even if the assembly is missing on disk, it still makes it to the compiler. --> |
|||
<Reference Include="@(_ReferencesFromNuGetPackages)" Condition="'%(_ReferencesFromNuGetPackages.NuGetSourceType)' != 'Project'" /> |
|||
<_ResolvedProjectReferencePaths Include="@(_ReferencesFromNuGetPackages)" Condition="'%(_ReferencesFromNuGetPackages.NuGetSourceType)' == 'Project'" /> |
|||
|
|||
<Reference Include="@(_ReferencesFromNuGetPackages)" /> |
|||
<!-- Remove simple name references if we're directly providing a reference assembly to the compiler. For example, |
|||
consider a project with an Reference Include="System", and some NuGet package is providing System.dll --> |
|||
<Reference Remove="%(_ReferencesFromNuGetPackages.FileName)" Condition="'%(_ReferencesFromNuGetPackages.NuGetIsFrameworkReference)' == 'false'"/> |
|||
</ItemGroup> |
|||
|
|||
<PropertyGroup Condition=" '$(AutoUnifyAssemblyReferences)' == 'true' "> |
|||
<!-- Normally Design Time Assembly Resolution (DTAR) won't consider these references. |
|||
Put DTAR in a mode where it will prefer the output of RAR and unify. --> |
|||
<DTARUseReferencesFromProject>true</DTARUseReferencesFromProject> |
|||
</PropertyGroup> |
|||
|
|||
<!-- The items in _NuGetContentItems need to go into the appropriately-named item group, but the names depend upon the items |
|||
themselves. Split it apart. --> |
|||
<CreateItem Include="@(_NuGetContentItems)" Condition="'@(_NuGetContentItems)' != ''"> |
|||
<Output TaskParameter="Include" ItemName="%(_NuGetContentItems.NuGetItemType)" /> |
|||
</CreateItem> |
|||
</Target> |
|||
<PropertyGroup Condition="'$(UseRoslynPathHack)' == 'true'"> |
|||
<CscToolPath>$(MSBuildToolsPath)\..\Roslyn</CscToolPath> |
|||
</PropertyGroup> |
|||
</Project> |
|||
@ -0,0 +1,208 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Runtime.InteropServices; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
using System.Windows; |
|||
using System.Windows.Interop; |
|||
using Avalonia.Direct2D1; |
|||
using SharpDX; |
|||
using SharpDX.Direct2D1; |
|||
using SharpDX.Direct3D11; |
|||
using SharpDX.Direct3D9; |
|||
using SharpDX.DXGI; |
|||
using AlphaMode = SharpDX.Direct2D1.AlphaMode; |
|||
using Device = SharpDX.Direct3D11.Device; |
|||
using Format = SharpDX.DXGI.Format; |
|||
using MapFlags = SharpDX.Direct3D11.MapFlags; |
|||
using PresentParameters = SharpDX.DXGI.PresentParameters; |
|||
using Query = SharpDX.Direct3D11.Query; |
|||
using QueryType = SharpDX.Direct3D11.QueryType; |
|||
using RenderTarget = SharpDX.Direct2D1.RenderTarget; |
|||
using Surface = SharpDX.DXGI.Surface; |
|||
using SwapEffect = SharpDX.DXGI.SwapEffect; |
|||
using Usage = SharpDX.Direct3D9.Usage; |
|||
|
|||
namespace Avalonia.Win32.Interop.Wpf |
|||
{ |
|||
class Direct2DImageSurface : IExternalDirect2DRenderTargetSurface, IDisposable |
|||
{ |
|||
class SwapBuffer: IDisposable |
|||
{ |
|||
private readonly Query _event; |
|||
private readonly SharpDX.Direct3D11.Resource _resource; |
|||
private readonly SharpDX.Direct3D11.Resource _sharedResource; |
|||
public SharpDX.Direct3D9.Surface Texture { get; } |
|||
public RenderTarget Target { get;} |
|||
public IntSize Size { get; } |
|||
|
|||
public SwapBuffer(IntSize size, Vector dpi) |
|||
{ |
|||
int width = (int) size.Width; |
|||
int height = (int) size.Height; |
|||
_event = new Query(s_dxDevice, new QueryDescription {Type = QueryType.Event}); |
|||
using (var texture = new Texture2D(s_dxDevice, new Texture2DDescription |
|||
{ |
|||
Width = width, |
|||
Height = height, |
|||
ArraySize = 1, |
|||
MipLevels = 1, |
|||
Format = Format.B8G8R8A8_UNorm, |
|||
Usage = ResourceUsage.Default, |
|||
SampleDescription = new SampleDescription(2, 0), |
|||
BindFlags = BindFlags.RenderTarget, |
|||
})) |
|||
using (var surface = texture.QueryInterface<Surface>()) |
|||
|
|||
{ |
|||
_resource = texture.QueryInterface<SharpDX.Direct3D11.Resource>(); |
|||
|
|||
Target = new RenderTarget(AvaloniaLocator.Current.GetService<SharpDX.Direct2D1.Factory>(), surface, |
|||
new RenderTargetProperties |
|||
{ |
|||
DpiX = (float) dpi.X, |
|||
DpiY = (float) dpi.Y, |
|||
MinLevel = FeatureLevel.Level_10, |
|||
PixelFormat = new PixelFormat(Format.B8G8R8A8_UNorm, AlphaMode.Premultiplied), |
|||
|
|||
}); |
|||
} |
|||
using (var texture = new Texture2D(s_dxDevice, new Texture2DDescription |
|||
{ |
|||
Width = width, |
|||
Height = height, |
|||
ArraySize = 1, |
|||
MipLevels = 1, |
|||
Format = Format.B8G8R8A8_UNorm, |
|||
Usage = ResourceUsage.Default, |
|||
SampleDescription = new SampleDescription(1, 0), |
|||
BindFlags = BindFlags.RenderTarget|BindFlags.ShaderResource, |
|||
OptionFlags = ResourceOptionFlags.Shared, |
|||
})) |
|||
using (var resource = texture.QueryInterface<SharpDX.DXGI.Resource>()) |
|||
{ |
|||
_sharedResource = texture.QueryInterface<SharpDX.Direct3D11.Resource>(); |
|||
var handle = resource.SharedHandle; |
|||
using (var texture9 = new Texture(s_d3DDevice, texture.Description.Width, |
|||
texture.Description.Height, 1, |
|||
Usage.RenderTarget, SharpDX.Direct3D9.Format.A8R8G8B8, Pool.Default, ref handle)) |
|||
Texture = texture9.GetSurfaceLevel(0); |
|||
} |
|||
Size = size; |
|||
} |
|||
|
|||
public void Dispose() |
|||
{ |
|||
Texture?.Dispose(); |
|||
Target?.Dispose(); |
|||
_resource?.Dispose(); |
|||
_sharedResource?.Dispose(); |
|||
_event?.Dispose(); |
|||
} |
|||
|
|||
public void Flush() |
|||
{ |
|||
s_dxDevice.ImmediateContext.ResolveSubresource(_resource, 0, _sharedResource, 0, Format.B8G8R8A8_UNorm); |
|||
s_dxDevice.ImmediateContext.Flush(); |
|||
s_dxDevice.ImmediateContext.End(_event); |
|||
s_dxDevice.ImmediateContext.GetData(_event).Dispose(); |
|||
} |
|||
} |
|||
|
|||
private D3DImage _image; |
|||
private SwapBuffer _backBuffer; |
|||
private readonly WpfTopLevelImpl _impl; |
|||
private static Device s_dxDevice; |
|||
private static Direct3DEx s_d3DContext; |
|||
private static DeviceEx s_d3DDevice; |
|||
private Vector _oldDpi; |
|||
|
|||
|
|||
[DllImport("user32.dll", SetLastError = false)] |
|||
private static extern IntPtr GetDesktopWindow(); |
|||
void EnsureDirectX() |
|||
{ |
|||
if(s_d3DDevice != null) |
|||
return; |
|||
s_d3DContext = new Direct3DEx(); |
|||
|
|||
SharpDX.Direct3D9.PresentParameters presentparams = new SharpDX.Direct3D9.PresentParameters |
|||
{ |
|||
Windowed = true, |
|||
SwapEffect = SharpDX.Direct3D9.SwapEffect.Discard, |
|||
DeviceWindowHandle = GetDesktopWindow(), |
|||
PresentationInterval = PresentInterval.Default |
|||
}; |
|||
s_dxDevice = s_dxDevice ?? AvaloniaLocator.Current.GetService<SharpDX.DXGI.Device>() |
|||
.QueryInterface<SharpDX.Direct3D11.Device>(); |
|||
s_d3DDevice = new DeviceEx(s_d3DContext, 0, DeviceType.Hardware, IntPtr.Zero, CreateFlags.HardwareVertexProcessing | CreateFlags.Multithreaded | CreateFlags.FpuPreserve, presentparams); |
|||
|
|||
} |
|||
|
|||
public Direct2DImageSurface(WpfTopLevelImpl impl) |
|||
{ |
|||
_impl = impl; |
|||
} |
|||
|
|||
public RenderTarget GetOrCreateRenderTarget() |
|||
{ |
|||
EnsureDirectX(); |
|||
var scale = _impl.GetScaling(); |
|||
var size = new IntSize(_impl.ActualWidth * scale.X, _impl.ActualHeight * scale.Y); |
|||
var dpi = scale * 96; |
|||
|
|||
if (_backBuffer!=null && _backBuffer.Size == size) |
|||
return _backBuffer.Target; |
|||
|
|||
if (_image == null || _oldDpi.X != dpi.X || _oldDpi.Y != dpi.Y) |
|||
{ |
|||
_image = new D3DImage(dpi.X, dpi.Y); |
|||
} |
|||
_impl.ImageSource = _image; |
|||
|
|||
RemoveAndDispose(ref _backBuffer); |
|||
if (size == default(IntSize)) |
|||
{ |
|||
_image.Lock(); |
|||
_image.SetBackBuffer(D3DResourceType.IDirect3DSurface9, IntPtr.Zero); |
|||
_image.Unlock(); |
|||
return null; |
|||
} |
|||
_backBuffer = new SwapBuffer(size, dpi); |
|||
|
|||
return _backBuffer.Target; |
|||
} |
|||
|
|||
void RemoveAndDispose<T>(ref T d) where T : IDisposable |
|||
{ |
|||
d?.Dispose(); |
|||
d = default(T); |
|||
} |
|||
|
|||
void Swap() |
|||
{ |
|||
_backBuffer.Flush(); |
|||
_image.Lock(); |
|||
_image.SetBackBuffer(D3DResourceType.IDirect3DSurface9, _backBuffer?.Texture?.NativePointer ?? IntPtr.Zero, true); |
|||
_image.AddDirtyRect(new Int32Rect(0, 0, _image.PixelWidth, _image.PixelHeight)); |
|||
_image.Unlock(); |
|||
} |
|||
|
|||
public void DestroyRenderTarget() |
|||
{ |
|||
RemoveAndDispose(ref _backBuffer); |
|||
} |
|||
|
|||
public void BeforeDrawing() |
|||
{ |
|||
|
|||
} |
|||
|
|||
public void AfterDrawing() => Swap(); |
|||
public void Dispose() |
|||
{ |
|||
RemoveAndDispose(ref _backBuffer); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,59 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading.Tasks; |
|||
|
|||
namespace Avalonia.Win32.Interop.Wpf |
|||
{ |
|||
struct IntSize : IEquatable<IntSize> |
|||
{ |
|||
public bool Equals(IntSize other) |
|||
{ |
|||
return Width == other.Width && Height == other.Height; |
|||
} |
|||
|
|||
public IntSize(int width, int height) |
|||
{ |
|||
Width = width; |
|||
Height = height; |
|||
} |
|||
|
|||
public IntSize(double width, double height) : this((int) width, (int) height) |
|||
{ |
|||
|
|||
} |
|||
|
|||
public static implicit operator IntSize(System.Windows.Size size) |
|||
{ |
|||
return new IntSize {Width = (int) size.Width, Height = (int) size.Height}; |
|||
} |
|||
|
|||
public override bool Equals(object obj) |
|||
{ |
|||
if (ReferenceEquals(null, obj)) return false; |
|||
return obj is IntSize && Equals((IntSize) obj); |
|||
} |
|||
|
|||
public override int GetHashCode() |
|||
{ |
|||
unchecked |
|||
{ |
|||
return (Width * 397) ^ Height; |
|||
} |
|||
} |
|||
|
|||
public static bool operator ==(IntSize left, IntSize right) |
|||
{ |
|||
return left.Equals(right); |
|||
} |
|||
|
|||
public static bool operator !=(IntSize left, IntSize right) |
|||
{ |
|||
return !left.Equals(right); |
|||
} |
|||
|
|||
public int Width { get; set; } |
|||
public int Height { get; set; } |
|||
} |
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> |
|||
<PropertyGroup> |
|||
<OutputPath>$(MSBuildThisFileDirectory)\bin</OutputPath> |
|||
<OutDir>$(OutputPath)</OutDir> |
|||
<TargetFrameworks>net461</TargetFrameworks> |
|||
<OutputType>Library</OutputType> |
|||
</PropertyGroup> |
|||
<ItemGroup> |
|||
<PackageReference Include="JetBrains.dotMemory.Unit" Version="109.0.20170720.104130-eap09" /> |
|||
</ItemGroup> |
|||
</Project> |
|||
Loading…
Reference in new issue