Merge pull request #1 from DisDis/clang_fixes

implement make_resource_current

Author: jwinarske

.gitignore

@@ -1,2 +1,3 @@
 out/
 sdk/
+.vscode

flutter/flutter_application.cc

@@ -70,6 +70,11 @@ FlutterApplication::FlutterApplication(
     return reinterpret_cast<FlutterApplication *>(userdata)
         ->render_delegate_.GetProcAddress(name);
   };
+  config.open_gl.make_resource_current =
+      [](void *userdata) -> bool {
+    return reinterpret_cast<FlutterApplication *>(userdata)
+        ->render_delegate_.OnApplicationMakeResourceCurrent();
+  };
 
   auto icu_data_path = GetICUDataPath();
 
@@ -94,7 +99,7 @@ FlutterApplication::FlutterApplication(
       .command_line_argv = command_line_args_c.data(),
   };
 
-    auto result = FlutterEngineRun(FLUTTER_ENGINE_VERSION, &config, &args,
+  auto result = FlutterEngineRun(FLUTTER_ENGINE_VERSION, &config, &args,
                                  this /* userdata */, &engine_);
 
   if (result != kSuccess) {

flutter/flutter_application.h

@@ -26,6 +26,8 @@ class FlutterApplication {
     virtual uint32_t OnApplicationGetOnscreenFBO() = 0;
 
     virtual void *GetProcAddress(const char *) = 0;
+
+    virtual bool OnApplicationMakeResourceCurrent() = 0;
   };
 
   FlutterApplication(std::string bundle_path,

flutter/main.cc

@@ -11,6 +11,8 @@
 #include "flutter_application.h"
 #include "pi_display.h"
 #include "utils.h"
+#define  GLFW_INCLUDE_ES2 
+#include <glfw3.h>
 
 namespace flutter {
 

flutter/pi_display.cc

@@ -180,9 +180,11 @@ bool PiDisplay::OnApplicationContextMakeCurrent() {
   }
   if (::eglMakeCurrent(display_, surface_, surface_, context_) != EGL_TRUE) {
     FLWAY_ERROR << "Could not make the context current." << std::endl;
-
     return false;
+  } else {
+    FLWAY_LOG << "call OnApplicationContextMakeCurrent"  << std::endl;
   }
+
   return true;
 }
 
@@ -196,6 +198,8 @@ bool PiDisplay::OnApplicationContextClearCurrent() {
                        EGL_NO_CONTEXT) != EGL_TRUE) {
     FLWAY_ERROR << "Could not clear the current context." << std::endl;
     return false;
+  } else {
+    FLWAY_LOG << "call OnApplicationContextClearCurrent"  << std::endl;
   }
   return true;
 }
@@ -210,11 +214,30 @@ bool PiDisplay::OnApplicationPresent() {
   if (::eglSwapBuffers(display_, surface_) != EGL_TRUE) {
     FLWAY_ERROR << "Could not swap buffers to present the screen." << std::endl;
     return false;
+  } else {
+    FLWAY_LOG << "call OnApplicationPresent"  << std::endl;
   }
 
   return true;
 }
 
+// |FlutterApplication::RenderDelegate|
+bool PiDisplay::OnApplicationMakeResourceCurrent(){
+  if (!valid_) {
+    FLWAY_ERROR << "Cannot make resource current an invalid display." << std::endl;
+    return false;
+  }
+        
+  if (::eglMakeCurrent(display_, surface_, surface_, context_) != EGL_TRUE) {
+    FLWAY_ERROR << "Could not make resource current." << std::endl;
+    return false;
+  } else {
+    FLWAY_LOG << "call OnApplicationMakeResourceCurrent"  << std::endl;
+  }
+  
+  return true;
+}
+
 // |FlutterApplication::RenderDelegate|
 uint32_t PiDisplay::OnApplicationGetOnscreenFBO() {
   // Just FBO0.
@@ -228,6 +251,7 @@ void *PiDisplay::GetProcAddress(const char *name) {
   }
 
   if (auto address = dlsym(RTLD_DEFAULT, name)) {
+    FLWAY_LOG << "call GetProcAddress:" << name  << std::endl;
     return address;
   }
 

flutter/pi_display.h

@@ -53,6 +53,10 @@ class PiDisplay : public FlutterApplication::RenderDelegate {
   // |FlutterApplication::RenderDelegate|
   void *GetProcAddress(const char *) override;
 
+   // |FlutterApplication::RenderDelegate|
+  bool OnApplicationMakeResourceCurrent() override;
+  
+
   FLWAY_DISALLOW_COPY_AND_ASSIGN(PiDisplay);
 };