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

Add WASM Support for Uno Platform #1333

Merged
merged 218 commits into from
Jul 21, 2020
Merged
Changes from 1 commit
Commits
Show all changes
218 commits
Select commit Hold shift + click to select a range
a93983d
Add support for uno-wasm
jeromelaban Apr 11, 2019
c5b4090
Adjust dependencies
jeromelaban Apr 11, 2019
53ebd43
Add CI support
jeromelaban Apr 11, 2019
fc5687d
Directory.Build.props
jeromelaban Apr 11, 2019
c9a0de2
Adjust for unsupported samples
jeromelaban Apr 11, 2019
8bb0366
Adjust string interop
jeromelaban Apr 11, 2019
09f4249
Update logging, disable some more samples
jeromelaban Apr 11, 2019
2f1b803
Add banner
jeromelaban Apr 12, 2019
374dd86
Enable AOT
jeromelaban Apr 12, 2019
d426988
Update description
jeromelaban Apr 12, 2019
170385a
Update readme
jeromelaban Apr 12, 2019
99d564d
Add listview workaround
jeromelaban Apr 12, 2019
2479746
Enable mixed mode, exclude skia from AOT
jeromelaban Apr 12, 2019
6bbc361
Disable AOT
jeromelaban Apr 12, 2019
e912eaf
Adjust for unsafe blocks
jeromelaban Apr 12, 2019
6734056
Adjust the splash color
jeromelaban Apr 12, 2019
71dfe5e
Remove color table filter sample, custom fonts samples.
jeromelaban Apr 12, 2019
17050e9
Add analytics, disable gif sample
jeromelaban Apr 12, 2019
98dceed
Add mono issue link
jeromelaban Apr 12, 2019
0e514f7
Adjust text color
jeromelaban Apr 12, 2019
f1e184c
Software rendering explanation
jeromelaban Apr 12, 2019
ba8e161
Move to static linking
jeromelaban Jun 19, 2019
b2b8f89
Update build
jeromelaban Jun 19, 2019
525271c
Adjust CI
jeromelaban Jun 20, 2019
0ece3b4
Adjust ci
jeromelaban Jun 20, 2019
f24bd0b
Adjust for content file
jeromelaban Jun 20, 2019
bfd7201
Generate packages
jeromelaban Jun 20, 2019
0660fba
Disable AOT until libSkiaSharp.bc can be linked
jeromelaban Jun 20, 2019
9ea4faf
Generate packages
jeromelaban Jun 20, 2019
276b36c
Add SKXamlCanvas for iOS/Android
jeromelaban Jun 20, 2019
2fde321
Build view.uno explicitly
jeromelaban Jun 20, 2019
6edd4de
Cleanup, wasm+bc inclusion
jeromelaban Jun 21, 2019
81dc170
Align SKXamlCanvas namespace, adjust nuget
jeromelaban Jun 21, 2019
a672def
Adjust libSkia path
jeromelaban Jun 21, 2019
9744b25
Workaround structure parameter marshaling issue for mono-wasm.
jeromelaban Jun 21, 2019
9f26631
Align UWP namespace
jeromelaban Jun 21, 2019
3acd268
Fix visibility
jeromelaban Jun 21, 2019
a89acab
Update bitcode output
jeromelaban Jun 21, 2019
8ea94ee
Adjust iOS and Android support
jeromelaban Jun 21, 2019
1be8a81
Update readme
jeromelaban Jun 21, 2019
aafd760
Merge pull request #1 from nventive/dev/jela/wasm-linking
jeromelaban Jun 21, 2019
ea782aa
Add more supported methods
jeromelaban Jun 25, 2019
46956e0
Merge pull request #2 from nventive/dev/jela/wasm-linking
jeromelaban Jun 25, 2019
4b7aa4f
Add AOT support for libSkia
jeromelaban Jun 27, 2019
b292551
Merge pull request #3 from nventive/dev/jela/wasm-linking
jeromelaban Jun 27, 2019
503c994
Update uno, banner
jeromelaban Jun 27, 2019
be5bae5
Merge pull request #4 from nventive/dev/jela/wasm-linking
jeromelaban Jun 27, 2019
de20c82
Add support for sk_shader_new_two_point_conical_gradient
jeromelaban Jun 30, 2019
1022645
Merge pull request #5 from unoplatform/dev/jela/wasm-linking
jeromelaban Jun 30, 2019
d1b6b92
Remove listview workaround
jeromelaban Jul 3, 2019
de50678
Update to fix splashscreen flicker
jeromelaban Jul 3, 2019
5bcbeaf
Merge branch 'uno' into dev/jela/updates
jeromelaban Jul 3, 2019
56e2b72
Merge pull request #6 from unoplatform/dev/jela/updates
jeromelaban Jul 3, 2019
ef27dac
Hide the command bar
jeromelaban Jul 3, 2019
7792f37
Merge pull request #7 from unoplatform/dev/jela/updates
jeromelaban Jul 3, 2019
8cc45a6
Add support for SKXamlCanvas.CanvasSize property
jeromelaban Jul 4, 2019
c3864f3
Add support for multiple native methods.
jeromelaban Jul 4, 2019
971da61
Restore working samples
jeromelaban Jul 4, 2019
07109f5
Merge pull request #8 from unoplatform/dev/jela/misc
jeromelaban Jul 4, 2019
c3b56ae
Adjust DPI support
jeromelaban Jul 8, 2019
1f9c4d9
Update to uno latest for DPI fixes
jeromelaban Jul 9, 2019
9903725
Update to uno latest for DPI fixes (#9)
ghuntley Jul 10, 2019
898353b
[Wasm] Fix support for sk_path_arc_to and sk_path_rarc_to
jeromelaban Aug 28, 2019
8290854
Merge pull request #10 from unoplatform/dev/jela/misc
jeromelaban Aug 28, 2019
21c712d
Fix sk_path_add_circle signature
jeromelaban Aug 29, 2019
e2f684e
Merge pull request #11 from unoplatform/dev/jela/misc
jeromelaban Aug 29, 2019
123d033
Merge from SkiaSharp master
jeromelaban Sep 30, 2019
bdf3fba
Wasm adjustments resulting of merge from master
jeromelaban Oct 1, 2019
2e159b7
Enable UI Tests
jeromelaban Oct 1, 2019
be541d2
Update screenshot method
jeromelaban Oct 2, 2019
b5aa860
Add gitpod support
jeromelaban Oct 2, 2019
1e948a0
Update for gitpod
jeromelaban Oct 2, 2019
4fdeebb
Adjust filename
jeromelaban Oct 2, 2019
e783983
Merge pull request #13 from unoplatform/dev/jela/merge-master
jeromelaban Oct 2, 2019
5fc2e86
BREAKING CHANGE: Update Uno.Wasm.Bootstrap to 1.1 for static linking
jeromelaban Feb 6, 2020
da314ee
Adjust emscripten version, fail linux fast
jeromelaban Feb 6, 2020
e9233ab
Merge pull request #15 from unoplatform/dev/jela/static-linking
jeromelaban Feb 6, 2020
e50ba66
Fix draw_line, draw_point, draw_circle
jeromelaban Feb 17, 2020
585e56c
Merge pull request #16 from unoplatform/dev/jela/misc-fixes
jeromelaban Feb 17, 2020
bb67570
fix: Dangling pointer in SKXamlCanvas after Unload
jeromelaban Mar 13, 2020
8d6e77b
Update gitversion
jeromelaban Mar 13, 2020
04c7658
Merge pull request #17 from unoplatform/dev/jela/misc-fixes
jeromelaban Mar 13, 2020
dd3e2a8
Merge from mono/skiasharp/develop
jeromelaban Apr 29, 2020
b721460
adjust wasm samples location
jeromelaban Apr 29, 2020
3c712eb
adjust sample
jeromelaban Apr 29, 2020
6f256c2
Update skia to latest xamarin-develop
jeromelaban Apr 29, 2020
f3ed814
ci: Build skia from submodule
jeromelaban Apr 29, 2020
f4550c6
fix: Adjust SKAbstractManagedStream to use IntPtr instead of void*
jeromelaban Apr 29, 2020
655e600
feat: Use libSkiaSharp.a
jeromelaban Apr 29, 2020
2f1ace1
Update skia module to latest
jeromelaban Apr 29, 2020
31ee0c0
Merge from origin/uno
jeromelaban Apr 30, 2020
6430ce4
chore: Adjust versions
jeromelaban Apr 30, 2020
52bf37d
Merge pull request #18 from unoplatform/dev/jela/m80
jeromelaban Apr 30, 2020
7130ed4
fix: Update the Was.Bootstrapper to fix a memory corruption issue
jeromelaban May 6, 2020
574119f
Merge pull request #20 from unoplatform/dev/jela/bootstrap-update
jeromelaban May 6, 2020
1d90dd1
fix: Restore disabled CPU shaders
jeromelaban May 12, 2020
7248979
Merge pull request #21 from unoplatform/dev/jela/cpu-shaders
jeromelaban May 12, 2020
653bcd4
Update versions for m84
mattleibow Jun 5, 2020
5274851
Revert "Update versions for m84"
mattleibow Jun 5, 2020
f20b6d8
feat(macOS): Add initial support for macOS
MartinZikmund Jun 5, 2020
405ca2a
chore: macOS only
MartinZikmund Jun 5, 2020
4b755b1
Merge pull request #22 from MartinZikmund/dev/mazi/macos-support
jeromelaban Jun 6, 2020
26ed7a7
Merge remote-tracking branch 'origin/master' into develop
mattleibow Jun 6, 2020
d04b610
Merge remote-tracking branch 'origin/master' into develop
mattleibow Jun 6, 2020
c05fc06
merge from mono/develop
jeromelaban Jun 8, 2020
ef65d2f
chore: Adjust wasm sample to use C# 8.0
jeromelaban Jun 9, 2020
46cda62
Merge pull request #23 from unoplatform/dev/jela/merge-mono
jeromelaban Jun 9, 2020
b0226b0
Merge branch 'master' into develop
mattleibow Jun 10, 2020
5da9671
Merge remote-tracking branch 'origin/master' into develop
mattleibow Jun 10, 2020
1f71333
Merge branch 'master' into develop
mattleibow Jun 10, 2020
0a13eba
Merge branch 'master' into dev/update
mattleibow Jun 11, 2020
b29c822
reduce diff
mattleibow Jun 11, 2020
4009e5c
Start merge
mattleibow Jun 12, 2020
03c3275
split project
mattleibow Jun 12, 2020
37aba42
More things
mattleibow Jun 12, 2020
8e2b785
native
mattleibow Jun 13, 2020
b0f4edf
remove old scipts
mattleibow Jun 13, 2020
5571fb9
more things
mattleibow Jun 13, 2020
a1e8dc5
basic sample
mattleibow Jun 13, 2020
dab2786
remove more things
mattleibow Jun 13, 2020
04135f6
Try building WASM on CI
mattleibow Jun 13, 2020
4b204a3
Better startup script
mattleibow Jun 13, 2020
ccf6501
don't install if we aren't going to use it
mattleibow Jun 13, 2020
5d7529b
More things
mattleibow Jun 14, 2020
143277c
More changes
mattleibow Jun 14, 2020
fe66112
Use a plain string
mattleibow Jun 14, 2020
506bf1f
Work
mattleibow Jun 14, 2020
ef386fd
Test other platforms
mattleibow Jun 14, 2020
dd620b2
Remove unused things
mattleibow Jun 14, 2020
eafa0ea
Wasm -> Uno
mattleibow Jun 14, 2020
8402e0d
Build WASM everywhere
mattleibow Jun 14, 2020
4707b7e
Skip the copy
mattleibow Jun 14, 2020
3f7cfe2
SkiaSharp.Views.Uno NuGet
mattleibow Jun 14, 2020
0bdc9e3
build everything
mattleibow Jun 14, 2020
143f3ff
Update azure-pipelines.yml
mattleibow Jun 15, 2020
c2354b7
Not needed anymore
mattleibow Jun 15, 2020
49fdca2
stuff
mattleibow Jun 15, 2020
004114b
Use the Uno.UI assemblies
mattleibow Jun 15, 2020
663d612
Fix the links
mattleibow Jun 15, 2020
f9343d0
Fix the gallery sample
mattleibow Jun 15, 2020
356af0e
revert samples
mattleibow Jun 15, 2020
e30f913
things
mattleibow Jun 15, 2020
1c7ca4d
Fix path samples
mattleibow Jun 15, 2020
d8c6635
VS is not showing those files...
mattleibow Jun 15, 2020
b55811d
New assets
mattleibow Jun 15, 2020
60bbd91
reduce code diff
mattleibow Jun 15, 2020
e0d24c1
duplicate for better changes
mattleibow Jun 15, 2020
b549ab0
Better linker
mattleibow Jun 15, 2020
5dd0227
Closer
mattleibow Jun 15, 2020
52a7e13
Merge branch 'master' into develop
mattleibow Jun 18, 2020
9baa9a3
Merge branch 'master' into dev/wasm
mattleibow Jun 18, 2020
d3260c2
No more skippies
mattleibow Jun 18, 2020
0496e0a
Merge remote-tracking branch 'origin/master' into develop
mattleibow Jun 24, 2020
ad9da80
Merge branch 'master' into dev/wasm
mattleibow Jun 24, 2020
a4579a8
Merge branch 'develop' into dev/wasm
mattleibow Jun 24, 2020
c475fef
Merge branch 'master' into develop
mattleibow Jun 27, 2020
f8cc880
Merge branch 'develop' into dev/wasm
mattleibow Jun 27, 2020
74a2137
Merge branch 'master' into dev/wasm
mattleibow Jun 28, 2020
73ab060
Merge branch 'master' into develop
mattleibow Jul 1, 2020
d9e7d28
Merge branch 'master' into develop
mattleibow Jul 9, 2020
4479d9c
Merge branch 'master' into dev/wasm
mattleibow Jul 9, 2020
7313e99
Merge branch 'develop' into dev/wasm
mattleibow Jul 9, 2020
38d1d05
Add a quick build script
mattleibow Jul 9, 2020
105cc85
Merge branch 'master' into develop
mattleibow Jul 14, 2020
61e3cb7
Merge branch 'develop' into dev/wasm
mattleibow Jul 14, 2020
05dd329
Make it build
mattleibow Jul 14, 2020
e3f1be7
Things
mattleibow Jul 14, 2020
a2d590f
More things
mattleibow Jul 14, 2020
d2e9f15
remove gallery for now
mattleibow Jul 14, 2020
fdae93e
From WSL
mattleibow Jul 14, 2020
f5ca1e0
Make it all work
mattleibow Jul 14, 2020
3caf79f
Don't build native now...
mattleibow Jul 14, 2020
f8bd479
Clean up a few lines
mattleibow Jul 14, 2020
439fb83
Mapped all the callback delegates
mattleibow Jul 15, 2020
99a7aa8
The big sample with everything
mattleibow Jul 15, 2020
a099cb8
Adding the gallery back
mattleibow Jul 15, 2020
8095b58
Merge branch 'master' into develop
mattleibow Jul 15, 2020
36eba74
Merge branch 'develop' into dev/wasm
mattleibow Jul 15, 2020
6a7bfce
Using JS const strings
mattleibow Jul 15, 2020
e0a5581
Everything still works
mattleibow Jul 15, 2020
5fa0213
Merge branch 'master' into develop
mattleibow Jul 16, 2020
bbe652b
No more hacks!
mattleibow Jul 16, 2020
7d27068
Merge remote-tracking branch 'origin/develop' into dev/wasm
mattleibow Jul 16, 2020
ae66e43
Gallery
mattleibow Jul 16, 2020
d64963d
things
mattleibow Jul 16, 2020
8c49a05
good night
mattleibow Jul 16, 2020
6e17770
use the interpreter for speedier builds
mattleibow Jul 16, 2020
0393773
remove old delegates
mattleibow Jul 16, 2020
7188d48
samples
mattleibow Jul 16, 2020
10e3386
more
mattleibow Jul 16, 2020
e3146c9
sample
mattleibow Jul 16, 2020
cf55735
add dng and pdf support
mattleibow Jul 16, 2020
43cf6f8
drop DNG for now
mattleibow Jul 16, 2020
f75fce7
Things
mattleibow Jul 16, 2020
a9974f0
Merge branch 'dev/wasm' of github.com:mono/SkiaSharp into dev/wasm
mattleibow Jul 16, 2020
9fad12c
warnings
mattleibow Jul 16, 2020
816e6b7
Fixing the build
mattleibow Jul 16, 2020
806dc91
Merge branch 'master' into develop
mattleibow Jul 16, 2020
e7429fe
Merge branch 'develop' into dev/wasm
mattleibow Jul 16, 2020
b5fad57
Oops
mattleibow Jul 16, 2020
73f8755
Things
mattleibow Jul 17, 2020
e969c49
updates
mattleibow Jul 17, 2020
ea99055
Logs
mattleibow Jul 17, 2020
965a284
Changes
mattleibow Jul 18, 2020
d4ba94d
Fix things
mattleibow Jul 18, 2020
d21bafa
dsafasdasfdsdaffd
mattleibow Jul 18, 2020
0ec9626
vmImage
mattleibow Jul 18, 2020
ec64a6b
yaml
mattleibow Jul 18, 2020
0934adc
Add GPU views just in case
mattleibow Jul 18, 2020
e313773
Merge branch 'master' into dev/wasm
mattleibow Jul 19, 2020
635a826
Merge remote-tracking branch 'origin/master' into dev/wasm
mattleibow Jul 20, 2020
4ebe1c1
No more SkiaSharp.Wasm! Use netstandard!
mattleibow Jul 20, 2020
7c66c13
the nugets
mattleibow Jul 20, 2020
ec94f36
fixes
mattleibow Jul 20, 2020
692c54a
remove this for now
mattleibow Jul 20, 2020
bc0a6a7
No fancy things needed
mattleibow Jul 20, 2020
6ae7946
final things
mattleibow Jul 20, 2020
ac7a1c6
deps
mattleibow Jul 21, 2020
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
Prev Previous commit
Next Next commit
Merge from SkiaSharp master
jeromelaban committed Sep 30, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 123d03373303df04441c59ebfcad163090db6f03
112 changes: 20 additions & 92 deletions binding/Binding/SKAbstractManagedStream.cs
Original file line number Diff line number Diff line change
@@ -60,84 +60,28 @@ internal struct Procs
public DestroyDelegate fDestroy;
}

#if !__WASM__
// delegate fields
private static readonly read_delegate fRead;
private static readonly peek_delegate fPeek;
private static readonly isAtEnd_delegate fIsAtEnd;
private static readonly hasPosition_delegate fHasPosition;
private static readonly hasLength_delegate fHasLength;
private static readonly rewind_delegate fRewind;
private static readonly getPosition_delegate fGetPosition;
private static readonly seek_delegate fSeek;
private static readonly move_delegate fMove;
private static readonly getLength_delegate fGetLength;
private static readonly createNew_delegate fCreateNew;
private static readonly destroy_delegate fDestroy;
#endif
private static readonly Procs delegates;

private int fromNative;

static SKAbstractManagedStream ()
{
#if __WASM__
//
// Javascript returns the list of registered methods, then the
// sk_managedstream_set_delegates gets called through P/Invoke
// because it is not exported when building for AOT.
//

var ret = WebAssembly.Runtime.InvokeJS($"SkiaSharp.SurfaceManager.registerManagedStream();");
var funcs = ret.Split (new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
.Select(f => (IntPtr)int.Parse(f, CultureInfo.InvariantCulture))
.ToArray();

if(funcs.Length == 12) {
SkiaApi.sk_managedstream_set_delegates (
funcs[0],
funcs[1],
funcs[2],
funcs[3],
funcs[4],
funcs[5],
funcs[6],
funcs[7],
funcs[8],
funcs[9],
funcs[10],
funcs[11]);
} else {
throw new InvalidOperationException($"Mismatch for registerManagedStream returned values (got {funcs.Length}, expected 12)");
}

#else
fRead = new read_delegate (ReadInternal);
fPeek = new peek_delegate (PeekInternal);
fIsAtEnd = new isAtEnd_delegate (IsAtEndInternal);
fHasPosition = new hasPosition_delegate (HasPositionInternal);
fHasLength = new hasLength_delegate (HasLengthInternal);
fRewind = new rewind_delegate (RewindInternal);
fGetPosition = new getPosition_delegate (GetPositionInternal);
fSeek = new seek_delegate (SeekInternal);
fMove = new move_delegate (MoveInternal);
fGetLength = new getLength_delegate (GetLengthInternal);
fCreateNew = new createNew_delegate (CreateNewInternal);
fDestroy = new destroy_delegate (DestroyInternal);

SkiaApi.sk_managedstream_set_delegates (
Marshal.GetFunctionPointerForDelegate (fRead),
Marshal.GetFunctionPointerForDelegate (fPeek),
Marshal.GetFunctionPointerForDelegate (fIsAtEnd),
Marshal.GetFunctionPointerForDelegate (fHasPosition),
Marshal.GetFunctionPointerForDelegate (fHasLength),
Marshal.GetFunctionPointerForDelegate (fRewind),
Marshal.GetFunctionPointerForDelegate (fGetPosition),
Marshal.GetFunctionPointerForDelegate (fSeek),
Marshal.GetFunctionPointerForDelegate (fMove),
Marshal.GetFunctionPointerForDelegate (fGetLength),
Marshal.GetFunctionPointerForDelegate (fCreateNew),
Marshal.GetFunctionPointerForDelegate (fDestroy));
#endif
delegates = new Procs {
fRead = ReadInternal,
fPeek = PeekInternal,
fIsAtEnd = IsAtEndInternal,
fHasPosition = HasPositionInternal,
fHasLength = HasLengthInternal,
fRewind = RewindInternal,
fGetPosition = GetPositionInternal,
fSeek = SeekInternal,
fMove = MoveInternal,
fGetLength = GetLengthInternal,
fDuplicate = DuplicateInternal,
fFork = ForkInternal,
fDestroy = DestroyInternal,
};
SkiaApi.sk_managedstream_set_procs (delegates);
}

protected SKAbstractManagedStream ()
@@ -152,13 +96,13 @@ protected SKAbstractManagedStream (bool owns)
Handle = SkiaApi.sk_managedstream_new (ctx);
}

internal void DisposeFromNative ()
protected override void DisposeNative ()
{
if (Interlocked.CompareExchange (ref fromNative, 0, 0) == 0)
SkiaApi.sk_managedstream_destroy (Handle);
}

protected internal abstract IntPtr OnRead (IntPtr buffer, IntPtr size);
protected abstract IntPtr OnRead (IntPtr buffer, IntPtr size);

protected internal abstract IntPtr OnPeek (IntPtr buffer, IntPtr size);

@@ -281,23 +225,7 @@ private static void DestroyInternal (IntPtr s, IntPtr context)
Interlocked.Exchange (ref stream.fromNative, 1);
stream.Dispose ();
}
}

internal static SKAbstractManagedStream AsManagedStream (IntPtr ptr)
{
if (AsManagedStream (ptr, out var target)) {
return target;
}
throw new ObjectDisposedException ("SKAbstractManagedStream: " + ptr);
}

internal static bool AsManagedStream (IntPtr ptr, out SKAbstractManagedStream target)
{
if (managedStreams.TryGetValue (ptr, out target)) {
return true;
}
target = null;
return false;
gch.Free ();
}
}

7 changes: 2 additions & 5 deletions binding/Binding/SKCodec.cs
Original file line number Diff line number Diff line change
@@ -291,11 +291,8 @@ public unsafe static SKCodec Create (SKStream stream, out SKCodecResult result)
if (stream == null)
throw new ArgumentNullException (nameof (stream));

int vresult = 0;

var codec = GetObject<SKCodec> (SkiaApi.sk_codec_new_from_stream_2 (stream.Handle, (IntPtr)(int)&vresult));
result = (SKCodecResult)vresult;
stream.RevokeOwnership ();
var codec = GetObject<SKCodec> (SkiaApi.sk_codec_new_from_stream (stream.Handle, out result));
stream.RevokeOwnership (codec);
return codec;
}

4 changes: 0 additions & 4 deletions binding/Binding/SkiaApi.cs
Original file line number Diff line number Diff line change
@@ -175,10 +175,6 @@ public static sk_colorspace_t sk_colorspace_new_rgb_with_gamma_named_and_gamut (
[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static float sk_colorspace_transfer_fn_transform (ref SKColorSpaceTransferFn transfer, float x);

// color type
[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static SKColorType sk_colortype_get_default_8888 ();

// surface
[DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_surface_t sk_surface_new_null (int width, int height);
37 changes: 36 additions & 1 deletion source/SkiaSharpSource.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28705.295
VisualStudioVersion = 16.0.29118.114
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.UWP", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.UWP\SkiaSharp.Views.Forms.UWP.csproj", "{3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}"
EndProject
@@ -89,6 +89,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "Sk
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{9E78300A-8251-4D87-B384-789F41088FB1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk3", "SkiaSharp.Views\SkiaSharp.Views.Gtk3\SkiaSharp.Views.Gtk3.csproj", "{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WindowsForms", "SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj", "{EDFAEF02-C462-4953-9CA4-4525479DD027}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{6FB08346-1A02-4793-B5E1-4F739C6342D5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common.NetStandard", "SkiaSharp.Views\SkiaSharp.Views.Desktop.Common.NetStandard\SkiaSharp.Views.Desktop.Common.NetStandard.csproj", "{293C78F5-0ACD-44A4-82F1-C35F11EFD444}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.WPF", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj", "{A88ED3B7-79F8-446F-B6BF-72E94BB153C0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{63924C1B-F8FB-4637-AC84-27280C301029}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.Wasm", "SkiaSharpSample\SkiaSharpSample.Wasm\SkiaSharpSample.Wasm.csproj", "{97590698-ABC5-4F7E-9760-CE2B6E1829DF}"
@@ -2053,6 +2063,26 @@ Global
{8DB9D82C-27F0-4978-8E66-2C0009D5940D}.Release|x64.Build.0 = Release|Any CPU
{8DB9D82C-27F0-4978-8E66-2C0009D5940D}.Release|x86.ActiveCfg = Release|Any CPU
{8DB9D82C-27F0-4978-8E66-2C0009D5940D}.Release|x86.Build.0 = Release|Any CPU
{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Release|Any CPU.Build.0 = Release|Any CPU
{EDFAEF02-C462-4953-9CA4-4525479DD027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EDFAEF02-C462-4953-9CA4-4525479DD027}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EDFAEF02-C462-4953-9CA4-4525479DD027}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EDFAEF02-C462-4953-9CA4-4525479DD027}.Release|Any CPU.Build.0 = Release|Any CPU
{6FB08346-1A02-4793-B5E1-4F739C6342D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6FB08346-1A02-4793-B5E1-4F739C6342D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6FB08346-1A02-4793-B5E1-4F739C6342D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6FB08346-1A02-4793-B5E1-4F739C6342D5}.Release|Any CPU.Build.0 = Release|Any CPU
{293C78F5-0ACD-44A4-82F1-C35F11EFD444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{293C78F5-0ACD-44A4-82F1-C35F11EFD444}.Debug|Any CPU.Build.0 = Debug|Any CPU
{293C78F5-0ACD-44A4-82F1-C35F11EFD444}.Release|Any CPU.ActiveCfg = Release|Any CPU
{293C78F5-0ACD-44A4-82F1-C35F11EFD444}.Release|Any CPU.Build.0 = Release|Any CPU
{A88ED3B7-79F8-446F-B6BF-72E94BB153C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A88ED3B7-79F8-446F-B6BF-72E94BB153C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A88ED3B7-79F8-446F-B6BF-72E94BB153C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A88ED3B7-79F8-446F-B6BF-72E94BB153C0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2100,6 +2130,11 @@ Global
{509B233A-35A0-41CA-A585-0B1A9F79D470} = {63924C1B-F8FB-4637-AC84-27280C301029}
{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D} = {63924C1B-F8FB-4637-AC84-27280C301029}
{8DB9D82C-27F0-4978-8E66-2C0009D5940D} = {C335869B-7CC8-4239-B4A5-8031AA9758D3}
{E20EECC0-6534-4625-AEDA-38D6EE0A99A0} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141}
{EDFAEF02-C462-4953-9CA4-4525479DD027} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141}
{6FB08346-1A02-4793-B5E1-4F739C6342D5} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141}
{293C78F5-0ACD-44A4-82F1-C35F11EFD444} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141}
{A88ED3B7-79F8-446F-B6BF-72E94BB153C0} = {DCADA8CC-D50A-4BD9-B2E6-86696A43D819}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {67EACD19-0CEA-4127-9842-549AA6FB84C9}
You are viewing a condensed version of this merge commit. You can view the full changes here.