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>
42 lines
1.7 KiB
Groff
42 lines
1.7 KiB
Groff
diff --git a/include/private/gpu/ganesh/GrContext_Base.h b/include/private/gpu/ganesh/GrContext_Base.h
|
|
index 847e76f232..e27d9454f8 100644
|
|
--- a/include/private/gpu/ganesh/GrContext_Base.h
|
|
+++ b/include/private/gpu/ganesh/GrContext_Base.h
|
|
@@ -20,7 +20,7 @@ class GrDirectContext;
|
|
struct GrContextOptions;
|
|
class GrBackendFormat;
|
|
|
|
-class GrContext_Base : public SkRefCnt {
|
|
+class SK_API GrContext_Base : public SkRefCnt {
|
|
public:
|
|
~GrContext_Base() override;
|
|
|
|
@@ -32,7 +32,7 @@ public:
|
|
/*
|
|
* The 3D API backing this context
|
|
*/
|
|
- SK_API GrBackendApi backend() const;
|
|
+ GrBackendApi backend() const;
|
|
|
|
/*
|
|
* Retrieve the default GrBackendFormat for a given SkColorType and renderability.
|
|
@@ -41,16 +41,16 @@ public:
|
|
*
|
|
* The caller should check that the returned format is valid.
|
|
*/
|
|
- SK_API GrBackendFormat defaultBackendFormat(SkColorType, GrRenderable) const;
|
|
+ GrBackendFormat defaultBackendFormat(SkColorType, GrRenderable) const;
|
|
|
|
- SK_API GrBackendFormat compressedBackendFormat(SkTextureCompressionType) const;
|
|
+ GrBackendFormat compressedBackendFormat(SkTextureCompressionType) const;
|
|
|
|
/**
|
|
* Gets the maximum supported sample count for a color type. 1 is returned if only non-MSAA
|
|
* rendering is supported for the color type. 0 is returned if rendering to this color type
|
|
* is not supported at all.
|
|
*/
|
|
- SK_API int maxSurfaceSampleCountForColorType(SkColorType colorType) const;
|
|
+ int maxSurfaceSampleCountForColorType(SkColorType colorType) const;
|
|
|
|
// TODO: When the public version is gone, rename to refThreadSafeProxy and add raw ptr ver.
|
|
sk_sp<GrContextThreadSafeProxy> threadSafeProxy();
|