Fix Skia build

Skia sample code uses private header files, we have no choice but to import them too.
ubald · May 23, 2018 · 945163a · 945163a
1 parent 31dd3b5
commit 945163a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,3 +1,3 @@
 # TODO
 
-* Build Skia with `is_official_build=true`
+* [DONE] Build Skia with `is_official_build=true`
diff --git a/extlib/skia/CMakeLists.txt b/extlib/skia/CMakeLists.txt
@@ -32,6 +32,6 @@ add_custom_command(OUTPUT ${SKIA_STATIC_LIB}
 
 add_custom_target(skia DEPENDS ${SKIA_STATIC_LIB})
 
-file(GLOB SKIA_INCLUDE_DIRS_ ${CMAKE_CURRENT_LIST_DIR}/../external/skia/include/*)
+file(GLOB SKIA_INCLUDE_DIRS_ ${CMAKE_CURRENT_LIST_DIR}/../external/skia/include/* ${CMAKE_CURRENT_LIST_DIR}/../external/skia/src/*)
 set(SKIA_INCLUDE_DIRS "${SKIA_INCLUDE_DIRS_}" PARENT_SCOPE)
 set(SKIA_LIBRARIES ${SKIA_STATIC_LIB} PARENT_SCOPE)
diff --git a/psychic-ui/Window.cpp b/psychic-ui/Window.cpp
@@ -3,6 +3,7 @@
 #include "Window.hpp"
 #include "SkSurface.h"
 #include "gl/GrGLInterface.h"
+#include "gl/GrGLUtil.h"
 
 
 namespace psychic_ui {
@@ -79,7 +80,7 @@ namespace psychic_ui {
 
     void Window::initSkia() {
         auto interface = GrGLMakeNativeInterface();
-        _sk_context = GrContext::MakeGL(nullptr).release();
+        _sk_context = GrContext::MakeGL(interface).release();
         getSkiaSurface();
     }
 
@@ -92,7 +93,7 @@ namespace psychic_ui {
 
         GrGLFramebufferInfo framebufferInfo{};
         framebufferInfo.fFBOID = 0;  // assume default framebuffer
-        framebufferInfo.fFormat = 0x8058; // TODO: Get proper values
+        framebufferInfo.fFormat = GR_GL_RGBA8;
 
 
         GrBackendRenderTarget backendRenderTarget(