commit 0122b4149328e962ecb397104f560ac4e64966e6
author Michael Reed <mike@reedtribe.org> Mon May 16 20:58:06 2022 -0400
committer Michael Reed <mike@reedtribe.org> Mon May 16 21:07:01 2022 -0400
tree 0b9bad1f96f4a6182bf886f28a26b0afcd61ca70
parent a9629940b2567bc62ddb1feebd07b9a5da32776c

Use explicit include paths for skia

skia/renderer/build/premake5.lua

diff --git a/skia/renderer/build/premake5.lua b/skia/renderer/build/premake5.lua
index 35cb477..303a069 100644
--- a/skia/renderer/build/premake5.lua
+++ b/skia/renderer/build/premake5.lua
@@ -34,22 +34,16 @@
 
     filter {"system:macosx" }
         buildoptions {"-flto=full"}
-        includedirs {"../../dependencies/skia", "../../dependencies/skia/include/core",
-             "../../dependencies/skia/include/effects", "../../dependencies/skia/include/gpu",
-             "../../dependencies/skia/include/config"}
+        includedirs {"../../dependencies/skia"}
         libdirs {"../../dependencies/skia/out/static"}
 
     filter {"system:linux or windows" }
-        includedirs {"../../dependencies/skia", "../../dependencies/skia/include/core",
-             "../../dependencies/skia/include/effects", "../../dependencies/skia/include/gpu",
-             "../../dependencies/skia/include/config"}
+        includedirs {"../../dependencies/skia"}
         libdirs {"../../dependencies/skia/out/static"}
 
     filter {"system:ios" }
         buildoptions {"-flto=full"}
-        includedirs {"../../dependencies/skia_rive_optimized", "../../dependencies/skia_rive_optimized/include/core",
-             "../../dependencies/skia_rive_optimized/include/effects", "../../dependencies/skia_rive_optimized/include/gpu",
-             "../../dependencies/skia_rive_optimized/include/config"}
+        includedirs {"../../dependencies/skia_rive_optimized"}
         libdirs {"../../dependencies/skia_rive_optimized/out/static"}
 
     filter {"system:ios", "options:variant=system" }
@@ -65,9 +59,7 @@
 
     -- Is there a way to pass 'arch' as a variable here?
     filter { "system:android" }
-        includedirs {"../../dependencies/skia_rive_optimized", "../../dependencies/skia_rive_optimized/include/core",
-             "../../dependencies/skia_rive_optimized/include/effects", "../../dependencies/skia_rive_optimized/include/gpu",
-             "../../dependencies/skia_rive_optimized/include/config"}
+        includedirs {"../../dependencies/skia_rive_optimized"}
         
         filter { "system:android", "options:arch=x86" }
             targetdir "%{cfg.system}/x86/bin/%{cfg.buildcfg}"

skia/renderer/include/skia_factory.hpp

diff --git a/skia/renderer/include/skia_factory.hpp b/skia/renderer/include/skia_factory.hpp
index 14abfa8..26629ed 100644
--- a/skia/renderer/include/skia_factory.hpp
+++ b/skia/renderer/include/skia_factory.hpp
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2022 Rive
+ */
+
 #ifndef _RIVE_SKIA_FACTORY_HPP_
 #define _RIVE_SKIA_FACTORY_HPP_
 

skia/renderer/include/skia_renderer.hpp

diff --git a/skia/renderer/include/skia_renderer.hpp b/skia/renderer/include/skia_renderer.hpp
index 706e663..fd21011 100644
--- a/skia/renderer/include/skia_renderer.hpp
+++ b/skia/renderer/include/skia_renderer.hpp
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2022 Rive
+ */
+
 #ifndef _RIVE_SKIA_RENDERER_HPP_
 #define _RIVE_SKIA_RENDERER_HPP_
 

skia/renderer/include/to_skia.hpp

diff --git a/skia/renderer/include/to_skia.hpp b/skia/renderer/include/to_skia.hpp
index 365b4c0..a80848a 100644
--- a/skia/renderer/include/to_skia.hpp
+++ b/skia/renderer/include/to_skia.hpp
@@ -1,7 +1,15 @@
+/*
+ * Copyright 2022 Rive
+ */
+
 #ifndef _RIVE_TO_SKIA_HPP_
 #define _RIVE_TO_SKIA_HPP_
 
-#include "SkPaint.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPathTypes.h"
+#include "include/core/SkTileMode.h"
+
 #include "rive/math/mat2d.hpp"
 #include "rive/math/vec2d.hpp"
 #include "rive/renderer.hpp"

skia/renderer/src/skia_factory.cpp

diff --git a/skia/renderer/src/skia_factory.cpp b/skia/renderer/src/skia_factory.cpp
index 044ddb1..017c160 100644
--- a/skia/renderer/src/skia_factory.cpp
+++ b/skia/renderer/src/skia_factory.cpp
@@ -1,16 +1,21 @@
+/*
+ * Copyright 2022 Rive
+ */
+
 #include "skia_factory.hpp"
 #include "skia_renderer.hpp"
+#include "to_skia.hpp"
 
-#include "SkCanvas.h"
-#include "SkData.h"
-#include "SkGradientShader.h"
-#include "SkImage.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkVertices.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkVertices.h"
+#include "include/effects/SkGradientShader.h"
+
 #include "rive/math/vec2d.hpp"
 #include "rive/shapes/paint/color.hpp"
-#include "to_skia.hpp"
 
 using namespace rive;
 
@@ -58,7 +63,7 @@
 public:
     SkiaRenderImage(sk_sp<SkImage> image);
 
-    sk_sp<SkImage> skImage() const { return m_SkImage; };
+    sk_sp<SkImage> skImage() const { return m_SkImage; }
 
     rcp<RenderShader>
     makeShader(RenderTileMode tx, RenderTileMode ty, const Mat2D* localMatrix) const override;
@@ -76,7 +81,7 @@
         memcpy(m_Buffer, src, bytes);
     }
 
-    ~SkiaBuffer() { free(m_Buffer); }
+    ~SkiaBuffer() override { free(m_Buffer); }
 
     const float* f32s() const {
         assert(m_ElemSize == sizeof(float));