Revert "Merge github.com:Advanced-Effects/Rendering-Lab-App"

This reverts commit 94f9029, reversing
changes made to f8979db.

Author: kaixoo12

src/ISkiaGLWindow.cpp

@@ -1,33 +1,34 @@
 #include "ISkiaGLWindow.h"
 
 #include "include/gpu/gl/GrGLInterface.h"
+#include "include/gpu/GrContext.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkGraphics.h"
 
 // The Skia Surface is the object we use to talk to the GPU
 // In order to render to an OpenGL context, we need to obtain the
 // SkSurface from the GL context directly.
 // Ref: https://skia.org/docs/user/api/skcanvas_creation/
-sk_sp<SkSurface> ISkiaGLWindow::obtainSkiaSurfaceFromCurrentGLContext() {
-        auto glContext = m_glWindow->glContext();
+sk_sp<SkSurface> obtainSkiaSurfaceFromCurrentGLContext(GLWindow *glWindow) {
+        auto glContext = glWindow->glContext();
 
         // Grabs the OpenGL context that is currently set as "current"
         // (we set it with `glfwMakeContextCurrent` in `main.cpp`)
         auto interface = GrGLMakeNativeInterface();
 
         const GrContextOptions &grOptions = GrContextOptions();
-        m_graphicsContext = GrContext::MakeGL(interface, grOptions);
+        auto grContext = GrContext::MakeGL(interface, grOptions);
 
-        int width = m_glWindow->width();
-        int height = m_glWindow->height();
+        int width = glWindow->width();
+        int height = glWindow->height();
         SkImageInfo imageInformation = SkImageInfo::MakeN32Premul(width, height);
 
 
         SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
 
         // Create the Skia Surface from the GL context
         return SkSurface::MakeRenderTarget(
-                m_graphicsContext.get(),
+                grContext.get(),
                 SkBudgeted::kNo,
                 imageInformation,
                 kTopLeft_GrSurfaceOrigin,
@@ -39,7 +40,7 @@ sk_sp<SkSurface> ISkiaGLWindow::obtainSkiaSurfaceFromCurrentGLContext() {
 SkCanvas* ISkiaGLWindow::obtainSkCanvas() {
         // NOTE: We put SkiaSurface in a class field to keep it in memory
         // So we can keep drawing (either it crashes)
-        m_skiaSurface = obtainSkiaSurfaceFromCurrentGLContext();
+        m_skiaSurface = obtainSkiaSurfaceFromCurrentGLContext(m_glWindow);
         if (!m_skiaSurface) {
                 return nullptr;
         }
@@ -56,8 +57,6 @@ void ISkiaGLWindow::requestPaint() {
     if (!m_skiaContext || !m_skiaSurface) return;
 
     paintThisFrame(m_skiaContext);
-    // Tell Skia to render stuff to GPU
-    m_graphicsContext->flush();
 };
 
 ISkiaGLWindow::ISkiaGLWindow(GLWindow *glWindow)

src/ISkiaGLWindow.h

@@ -3,7 +3,6 @@
 #include "GLWindow.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkSurface.h"
-#include "include/gpu/GrContext.h"
 
 // This object connects the Skia library to the OpenGL window,
 // and provides a method to draw.
@@ -21,12 +20,9 @@ class ISkiaGLWindow {
 
         // Skia Canvas is the object we use to draw shapes
         SkCanvas* m_skiaContext = nullptr;
-        sk_sp<SkSurface> obtainSkiaSurfaceFromCurrentGLContext();
         SkCanvas* obtainSkCanvas();
         // we store skia surface here to keep it in memory
         sk_sp<SkSurface> m_skiaSurface;
-        // portal between software and the gpu
-        sk_sp<GrContext> m_graphicsContext = nullptr;
 
         // Call this function when something happens on the canvas and needs to be redrawn.
         // (An object changes, a new keyframe is selected, zoom in/out...)