1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
diff -ur skia.org/tools/window/WindowContext.h skia/tools/window/WindowContext.h
--- skia.org/tools/window/WindowContext.h 2024-10-12 15:57:21
+++ skia/tools/window/WindowContext.h 2024-10-12 15:58:48
@@ -23,7 +23,7 @@
namespace skwindow {
-class WindowContext {
+class SK_API WindowContext {
public:
WindowContext(const DisplayParams&);
diff -ur skia.org/tools/window/mac/GaneshMetalWindowContext_mac.h skia/tools/window/mac/GaneshMetalWindowContext_mac.h
--- skia.org/tools/window/mac/GaneshMetalWindowContext_mac.h 2024-10-12 15:57:21
+++ skia/tools/window/mac/GaneshMetalWindowContext_mac.h 2024-10-12 15:59:18
@@ -8,6 +8,7 @@
#ifndef GaneshMetalWindowContext_mac_DEFINED
#define GaneshMetalWindowContext_mac_DEFINED
+#include "include/private/base/SkAPI.h"
#include <memory>
namespace skwindow {
@@ -15,7 +16,7 @@
struct DisplayParams;
struct MacWindowInfo;
-std::unique_ptr<WindowContext> MakeGaneshMetalForMac(const MacWindowInfo&, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeGaneshMetalForMac(const MacWindowInfo&, const DisplayParams&);
} // namespace skwindow
#endif
diff -ur skia.org/tools/window/unix/GaneshGLWindowContext_unix.h skia/tools/window/unix/GaneshGLWindowContext_unix.h
--- skia.org/tools/window/unix/GaneshGLWindowContext_unix.h 2024-10-12 15:57:21
+++ skia/tools/window/unix/GaneshGLWindowContext_unix.h 2024-10-12 15:59:44
@@ -8,6 +8,7 @@
#ifndef GaneshGLWindowContext_unix_DEFINED
#define GaneshGLWindowContext_unix_DEFINED
+#include "include/private/base/SkAPI.h"
#include <memory>
namespace skwindow {
@@ -15,7 +16,7 @@
struct DisplayParams;
struct XlibWindowInfo;
-std::unique_ptr<WindowContext> MakeGaneshGLForXlib(const XlibWindowInfo&, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeGaneshGLForXlib(const XlibWindowInfo&, const DisplayParams&);
} // namespace skwindow
#endif
diff -ur skia.org/tools/window/unix/GaneshVulkanWindowContext_unix.h skia/tools/window/unix/GaneshVulkanWindowContext_unix.h
--- skia.org/tools/window/unix/GaneshVulkanWindowContext_unix.h 2024-10-12 15:57:21
+++ skia/tools/window/unix/GaneshVulkanWindowContext_unix.h 2024-10-12 15:58:48
@@ -8,6 +8,7 @@
#ifndef GaneshVulkanWindowContext_unix_DEFINED
#define GaneshVulkanWindowContext_unix_DEFINED
+#include "include/private/base/SkAPI.h"
#include <memory>
namespace skwindow {
@@ -15,7 +16,7 @@
struct DisplayParams;
struct XlibWindowInfo;
-std::unique_ptr<WindowContext> MakeGaneshVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeGaneshVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
} // namespace skwindow
#endif
diff -ur skia.org/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h skia/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h
--- skia.org/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h 2024-10-12 15:57:21
+++ skia/tools/window/unix/GraphiteDawnVulkanWindowContext_unix.h 2024-10-12 15:58:48
@@ -8,6 +8,7 @@
#ifndef GraphiteDawnVulkanWindowContext_unix_DEFINED
#define GraphiteDawnVulkanWindowContext_unix_DEFINED
+#include "include/private/base/SkAPI.h"
#include <memory>
namespace skwindow {
@@ -15,7 +16,7 @@
struct DisplayParams;
struct XlibWindowInfo;
-std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&,
+SK_API std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&,
const DisplayParams&);
} // namespace skwindow
diff -ur skia.org/tools/window/unix/RasterWindowContext_unix.h skia/tools/window/unix/RasterWindowContext_unix.h
--- skia.org/tools/window/unix/RasterWindowContext_unix.h 2024-10-12 15:57:21
+++ skia/tools/window/unix/RasterWindowContext_unix.h 2024-10-12 15:58:48
@@ -8,6 +8,7 @@
#ifndef RasterWindowContext_unix_DEFINED
#define RasterWindowContext_unix_DEFINED
+#include "include/private/base/SkAPI.h"
#include <memory>
namespace skwindow {
@@ -15,7 +16,7 @@
struct DisplayParams;
struct XlibWindowInfo;
-std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
} // namespace skwindow
#endif
diff -ur skia.org/tools/window/win/WindowContextFactory_win.h skia/tools/window/win/WindowContextFactory_win.h
--- skia.org/tools/window/win/WindowContextFactory_win.h 2024-10-12 15:57:21
+++ skia/tools/window/win/WindowContextFactory_win.h 2024-10-12 16:00:18
@@ -13,28 +13,31 @@
#include <memory>
+#include "include/private/base/SkAPI.h"
+#include "include/core/SkTypes.h"
+
namespace skwindow {
class WindowContext;
struct DisplayParams;
#ifdef SK_VULKAN
-std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&);
#if defined(SK_GRAPHITE)
std::unique_ptr<WindowContext> MakeGraphiteVulkanForWin(HWND, const DisplayParams&);
#endif
#endif
#ifdef SK_GL
-std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&);
#endif
#ifdef SK_ANGLE
-std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&);
#endif
#ifdef SK_DIRECT3D
-std::unique_ptr<WindowContext> MakeD3D12ForWin(HWND, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeD3D12ForWin(HWND, const DisplayParams&);
#endif
#ifdef SK_DAWN
@@ -43,7 +46,7 @@
#endif
#endif
-std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&);
+SK_API std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&);
} // namespace skwindow
|