From fb3df0633787c33aebfa249126af1565778099b5 Mon Sep 17 00:00:00 2001
From: faiface <faiface@ksp.sk>
Date: Fri, 6 Jan 2017 15:00:05 +0100
Subject: [PATCH] add common response channel for main thread

---
 pixelgl/thread.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pixelgl/thread.go b/pixelgl/thread.go
index 49abb77..0fefbee 100644
--- a/pixelgl/thread.go
+++ b/pixelgl/thread.go
@@ -9,7 +9,10 @@ import (
 // Due to the limitations of OpenGL and operating systems, all OpenGL related calls must be
 // done from the main thread.
 
-var callQueue = make(chan func(), 32)
+var (
+	callQueue = make(chan func(), 8)
+	respChan  = make(chan interface{}, 4)
+)
 
 func init() {
 	runtime.LockOSThread()
@@ -65,12 +68,11 @@ func DoNoBlock(f func()) {
 //
 // All OpenGL calls must be done in the dedicated thread.
 func Do(f func()) {
-	done := make(chan struct{})
 	callQueue <- func() {
 		f()
-		close(done)
+		respChan <- struct{}{}
 	}
-	<-done
+	<-respChan
 }
 
 // DoErr executes a function inside the main OpenGL thread and returns an error to the called.
@@ -78,11 +80,14 @@ func Do(f func()) {
 //
 // All OpenGL calls must be done in the dedicated thread.
 func DoErr(f func() error) error {
-	err := make(chan error)
 	callQueue <- func() {
-		err <- f()
+		respChan <- f()
 	}
-	return <-err
+	err := <-respChan
+	if err != nil {
+		return err.(error)
+	}
+	return nil
 }
 
 // DoVal executes a function inside the main OpenGL thread and returns a value to the caller.
@@ -90,9 +95,8 @@ func DoErr(f func() error) error {
 //
 // All OpenGL calls must be done in the main thread.
 func DoVal(f func() interface{}) interface{} {
-	val := make(chan interface{})
 	callQueue <- func() {
-		val <- f()
+		respChan <- f()
 	}
-	return <-val
+	return <-respChan
 }