f8c15850db
(from m111)
SK_SUPPORT_GPU is now SK_GANESH
GR_OP_ALLOCATE_USE_NEW was removed in skia m111
commit dd8f8ed3848cbe2032edc7ec08ef648a23e28ad9
Author: Mike Klein <mtklein@google.com>
Date: Thu Apr 22 12:17:33 2021 -0500
clean up defines that do nothing
the fast-png-write patch was removed. The underlying helper
function we need was removed in
commit 0ec4c84abd0b578a5c792b04b56653cbc325530e
Author: Kevin Lubick <kjlubick@google.com>
Date: Thu Apr 20 14:46:28 2023 -0400
Remove SkImageEncoder and SkImage::encodeToData
So I updated our dump() function in SkiaHelper.cxx to
use the new Skia API.
The constexpr-template patch seems to be superceded by skia
changes.
SkOpts: :hash_fn has been replaced with SkChecksum::Hash32
commit 657ed9cf2379a950b925cb2aba7c85d6e1dd36ed
Author: Brian Osman <brianosman@google.com>
Date: Tue May 23 12:40:12 2023 +0000
Reland "Replace SkOpts::hash/hash_fn with SkChecksum::Hash32"
The SkDebugf function needs to be exported from the library since
it leaks out to calling code via some of the headers.
Change-Id: I80ace8f25e660fa7889d22ef90676f47264d866c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154223
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
99 lines
4 KiB
Groff
99 lines
4 KiB
Groff
diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
|
|
index 79f6d72f35..428d198159 100644
|
|
--- a/tools/sk_app/WindowContext.h
|
|
+++ b/tools/sk_app/WindowContext.h
|
|
@@ -22,7 +22,7 @@ class Context;
|
|
|
|
namespace sk_app {
|
|
|
|
-class WindowContext {
|
|
+class SK_API WindowContext {
|
|
public:
|
|
WindowContext(const DisplayParams&);
|
|
|
|
diff --git a/tools/sk_app/mac/WindowContextFactory_mac.h b/tools/sk_app/mac/WindowContextFactory_mac.h
|
|
index 3e136a8f57..affb89e43e 100644
|
|
--- a/tools/sk_app/mac/WindowContextFactory_mac.h
|
|
+++ b/tools/sk_app/mac/WindowContextFactory_mac.h
|
|
@@ -52,7 +52,7 @@ std::unique_ptr<WindowContext> MakeDawnMTLForMac(const MacWindowInfo&, const Dis
|
|
#endif
|
|
|
|
#ifdef SK_METAL
|
|
-std::unique_ptr<WindowContext> MakeMetalForMac(const MacWindowInfo&, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeMetalForMac(const MacWindowInfo&, const DisplayParams&);
|
|
#if defined(SK_GRAPHITE)
|
|
std::unique_ptr<WindowContext> MakeGraphiteMetalForMac(const MacWindowInfo&, const DisplayParams&);
|
|
#endif
|
|
diff --git a/tools/sk_app/unix/WindowContextFactory_unix.h b/tools/sk_app/unix/WindowContextFactory_unix.h
|
|
index 11bd2d2ac2..09c92dc417 100644
|
|
--- a/tools/sk_app/unix/WindowContextFactory_unix.h
|
|
+++ b/tools/sk_app/unix/WindowContextFactory_unix.h
|
|
@@ -36,20 +36,20 @@ struct XlibWindowInfo {
|
|
int fHeight;
|
|
};
|
|
|
|
-std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
|
|
-std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeGLForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
|
|
#ifdef SK_DAWN
|
|
-std::unique_ptr<WindowContext> MakeDawnVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeDawnVulkanForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
#endif
|
|
|
|
#if defined(SK_DAWN) && defined(SK_GRAPHITE)
|
|
std::unique_ptr<WindowContext> MakeGraphiteDawnVulkanForXlib(const XlibWindowInfo&,
|
|
const DisplayParams&);
|
|
#endif
|
|
|
|
-std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeRasterForXlib(const XlibWindowInfo&, const DisplayParams&);
|
|
|
|
} // namespace window_context_factory
|
|
|
|
diff --git a/tools/sk_app/win/WindowContextFactory_win.h b/tools/sk_app/win/WindowContextFactory_win.h
|
|
index c05a4f0acf..fc27cd2afb 100644
|
|
--- a/tools/sk_app/win/WindowContextFactory_win.h
|
|
+++ b/tools/sk_app/win/WindowContextFactory_win.h
|
|
@@ -13,31 +13,33 @@ struct DisplayParams;
|
|
|
|
#include <memory>
|
|
|
|
+#include "include/core/SkTypes.h"
|
|
+
|
|
namespace sk_app {
|
|
|
|
class WindowContext;
|
|
struct DisplayParams;
|
|
|
|
namespace window_context_factory {
|
|
|
|
-std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeVulkanForWin(HWND, const DisplayParams&);
|
|
|
|
-std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeGLForWin(HWND, const DisplayParams&);
|
|
|
|
-std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeANGLEForWin(HWND, const DisplayParams&);
|
|
|
|
#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
|
|
-std::unique_ptr<WindowContext> MakeDawnD3D12ForWin(HWND, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeDawnD3D12ForWin(HWND, const DisplayParams&);
|
|
#if defined(SK_GRAPHITE)
|
|
std::unique_ptr<WindowContext> MakeGraphiteDawnD3D12ForWin(HWND, const DisplayParams&);
|
|
#endif
|
|
#endif
|
|
|
|
-std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&);
|
|
+SK_API std::unique_ptr<WindowContext> MakeRasterForWin(HWND, const DisplayParams&);
|
|
|
|
} // namespace window_context_factory
|
|
|