Feature/event loop interop

application.go

@@ -100,6 +100,11 @@ func (a *Application) Run() error {
 		return errors.Errorf("invalid window mode %T", a.config.windowMode)
 	}
 
+	glfw.WindowHint(glfw.ContextVersionMajor, 4) // OR 2
+	glfw.WindowHint(glfw.ContextVersionMinor, 1)
+	glfw.WindowHint(glfw.OpenGLProfile, glfw.OpenGLCoreProfile)
+	glfw.WindowHint(glfw.OpenGLForwardCompatible, glfw.True)
+
 	a.window, err = glfw.CreateWindow(a.config.windowInitialDimensions.width, a.config.windowInitialDimensions.height, "Loading..", monitor, nil)
 	if err != nil {
 		return errors.Wrap(err, "creating glfw window")
@@ -203,8 +208,20 @@ func (a *Application) Run() error {
 		return glfw.GetProcAddress(procName)
 	}
 
+	eventLoop := newEventLoop(
+		glfw.PostEmptyEvent, // Wakeup GLFW
+		a.engine.RunTask,    // Flush tasks
+	)
+	a.engine.TaskRunnerRunOnCurrentThread = eventLoop.RunOnCurrentThread
+	a.engine.TaskRunnerPostTask = eventLoop.PostTask
+
 	a.engine.PlatfromMessage = messenger.handlePlatformMessage
 
+	texturer := newRegistry(a.engine, a.window)
+	a.engine.GLExternalTextureFrameCallback = texturer.handleExternalTexture
+
+	texturer.init()
+
 	// Not very nice, but we can only really fix this when there's a pluggable
 	// renderer.
 	defaultTextinputPlugin.keyboardLayout = a.config.keyboardLayout
@@ -242,6 +259,16 @@ func (a *Application) Run() error {
 	// platfrom message can be corectly handled by ui.Window.onPlatformMessage.
 	glfw.WaitEvents()
 
+	for _, p := range a.config.plugins {
+		// Extra init call for plugins that satisfy the PluginTexture interface.
+		if glfwPlugin, ok := p.(PluginTexture); ok {
+			err = glfwPlugin.InitPluginTexture(texturer)
+			if err != nil {
+				return errors.Wrap(err, "failed to initialize texture plugin"+fmt.Sprintf("%T", p))
+			}
+		}
+	}
+
 	a.window.SetKeyCallback(
 		func(window *glfw.Window, key glfw.Key, scancode int, action glfw.Action, mods glfw.ModifierKey) {
 			defaultTextinputPlugin.glfwKeyCallback(window, key, scancode, action, mods)
@@ -258,8 +285,9 @@ func (a *Application) Run() error {
 	defer a.engine.Shutdown()
 
 	for !a.window.ShouldClose() {
-		glfw.WaitEventsTimeout(0.016) // timeout to get 60fps-ish iterations
-		embedder.FlutterEngineFlushPendingTasksNow()
+		eventLoop.WaitForEvents(func(duration float64) {
+			glfw.WaitEventsTimeout(duration)
+		})
 		defaultPlatformPlugin.glfwTasker.ExecuteTasks()
 		messenger.engineTasker.ExecuteTasks()
 	}

embedder/embedder.go

@@ -53,6 +53,19 @@ const (
 	ResultEngineNotRunning      Result = -1
 )
 
+// FlutterOpenGLTexture corresponds to the C.FlutterOpenGLTexture struct.
+type FlutterOpenGLTexture struct {
+	// Target texture of the active texture unit (example GL_TEXTURE_2D)
+	Target uint32
+	// The name of the texture
+	Name uint32
+	// The texture format (example GL_RGBA8)
+	Format uint32
+}
+
+// FlutterTask is a type alias to C.FlutterTask
+type FlutterTask = C.FlutterTask
+
 // FlutterEngine corresponds to the C.FlutterEngine with his associated callback's method.
 type FlutterEngine struct {
 	// Flutter Engine.
@@ -65,12 +78,17 @@ type FlutterEngine struct {
 	index int
 
 	// GL callback functions
-	GLMakeCurrent         func() bool
-	GLClearCurrent        func() bool
-	GLPresent             func() bool
-	GLFboCallback         func() int32
-	GLMakeResourceCurrent func() bool
-	GLProcResolver        func(procName string) unsafe.Pointer
+	GLMakeCurrent                  func() bool
+	GLClearCurrent                 func() bool
+	GLPresent                      func() bool
+	GLFboCallback                  func() int32
+	GLMakeResourceCurrent          func() bool
+	GLProcResolver                 func(procName string) unsafe.Pointer
+	GLExternalTextureFrameCallback func(textureID int64, width int, height int) *FlutterOpenGLTexture
+
+	// task runner interop
+	TaskRunnerRunOnCurrentThread func() bool
+	TaskRunnerPostTask           func(trask FlutterTask, targetTimeNanos uint64)
 
 	// platform message callback function
 	PlatfromMessage func(message *PlatformMessage)
@@ -299,10 +317,48 @@ func (flu *FlutterEngine) SendPlatformMessageResponse(
 	return (Result)(res)
 }
 
-// FlutterEngineFlushPendingTasksNow flush tasks on a  message loop not
-// controlled by the Flutter engine.
-//
-// deprecated soon.
-func FlutterEngineFlushPendingTasksNow() {
-	C.__FlutterEngineFlushPendingTasksNow()
+// RegisterExternalTexture registers an external texture with a unique identifier.
+func (flu *FlutterEngine) RegisterExternalTexture(textureID int64) Result {
+	flu.sync.Lock()
+	defer flu.sync.Unlock()
+	if flu.closed {
+		return ResultEngineNotRunning
+	}
+	res := C.FlutterEngineRegisterExternalTexture(flu.Engine, C.int64_t(textureID))
+	return (Result)(res)
+}
+
+// UnregisterExternalTexture unregisters a previous texture registration.
+func (flu *FlutterEngine) UnregisterExternalTexture(textureID int64) Result {
+	flu.sync.Lock()
+	defer flu.sync.Unlock()
+	if flu.closed {
+		return ResultEngineNotRunning
+	}
+	res := C.FlutterEngineUnregisterExternalTexture(flu.Engine, C.int64_t(textureID))
+	return (Result)(res)
+}
+
+// MarkExternalTextureFrameAvailable marks that a new texture frame is
+// available for a given texture identifier.
+func (flu *FlutterEngine) MarkExternalTextureFrameAvailable(textureID int64) Result {
+	flu.sync.Lock()
+	defer flu.sync.Unlock()
+	if flu.closed {
+		return ResultEngineNotRunning
+	}
+	res := C.FlutterEngineMarkExternalTextureFrameAvailable(flu.Engine, C.int64_t(textureID))
+	return (Result)(res)
+}
+
+// Get the current time in nanoseconds from the clock used by the flutter
+// engine.
+func FlutterEngineGetCurrentTime() uint64 {
+  return uint64(C.FlutterEngineGetCurrentTime())
+}
+
+// RunTask inform the engine to run the specified task.
+func (flu *FlutterEngine) RunTask(task *FlutterTask) Result {
+	res := C.FlutterEngineRunTask(flu.Engine, task)
+	return (Result)(res)
 }