#132 Temporal hack to run with Go1.5

exp/audio/audio.go

@@ -15,7 +15,7 @@
 package audio
 
 import (
-	"github.com/hajimehoshi/ebiten/exp/audio/internal"
+	"github.com/hajimehoshi/ebiten/exp/audio/inner"
 )
 
 // SampleRate returns the sampling frequency (e.g. 44100).

gamecontext.go

@@ -15,9 +15,9 @@
 package ebiten
 
 import (
-	audio "github.com/hajimehoshi/ebiten/exp/audio/internal"
+	audio "github.com/hajimehoshi/ebiten/exp/audio/inner"
 	"github.com/hajimehoshi/ebiten/internal/graphics"
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 	"github.com/hajimehoshi/ebiten/internal/ui"
 	"image"
 )

graphics.go

@@ -15,7 +15,7 @@
 package ebiten
 
 import (
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 )
 
 // Filter represents the type of filter to be used when an image is maginified or minified.

graphicscontext.go

@@ -16,7 +16,7 @@ package ebiten
 
 import (
 	"github.com/hajimehoshi/ebiten/internal/graphics"
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 	"github.com/hajimehoshi/ebiten/internal/ui"
 )
 

image.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/hajimehoshi/ebiten/internal/graphics"
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 	"image"
 	"image/color"
 )

internal/graphics/draw.go

@@ -17,7 +17,7 @@ package graphics
 import (
 	"errors"
 	"fmt"
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 )
 
 func glMatrix(m *[4][4]float64) []float32 {

internal/graphics/framebuffer.go

@@ -15,7 +15,7 @@
 package graphics
 
 import (
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 	"image/color"
 	"math"
 )

internal/graphics/opengl/context.go

@@ -73,6 +73,12 @@ func (c *Context) init() {
 	gl.BlendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA)
 }
 
+func (c *Context) Check() {
+	if e := gl.GetError(); e != gl.NO_ERROR {
+		panic(fmt.Sprintf("check failed: %d", e))
+	}
+}
+
 func (c *Context) NewTexture(width, height int, pixels []uint8, filter Filter) (Texture, error) {
 	var t uint32
 	gl.GenTextures(1, &t)

internal/graphics/program.go

@@ -15,7 +15,7 @@
 package graphics
 
 import (
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 	"math"
 )
 

internal/graphics/shader.go

@@ -15,7 +15,7 @@
 package graphics
 
 import (
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 	"strings"
 )
 

internal/graphics/texture.go

@@ -16,7 +16,7 @@ package graphics
 
 import (
 	"errors"
-	"github.com/hajimehoshi/ebiten/internal/graphics/internal/opengl"
+	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 	"image"
 	"image/draw"
 )

internal/ui/ui_glfw.go

@@ -64,10 +64,16 @@ func Init() {
 
 func ExecOnUIThread(f func()) {
 	ch := make(chan struct{})
-	currentUI.funcs <- func() {
+	/*currentUI.funcs <- func() {
 		defer close(ch)
 		f()
-	}
+	}*/
+	go func() {
+		defer close(ch)
+		runtime.LockOSThread()
+		currentUI.window.MakeContextCurrent()
+		f()
+	}()
 	<-ch
 }
 

run.go

@@ -15,7 +15,7 @@
 package ebiten
 
 import (
-	audio "github.com/hajimehoshi/ebiten/exp/audio/internal"
+	audio "github.com/hajimehoshi/ebiten/exp/audio/inner"
 	"github.com/hajimehoshi/ebiten/internal/ui"
 	"time"
 )
@@ -54,6 +54,10 @@ func Run(f func(*Image) error, width, height, scale int, title string) error {
 	}
 	defer ui.Terminate()
 
+	ui.ExecOnUIThread(func() {
+		glContext.Check()
+	})
+
 	graphicsContext, err := newGraphicsContext(width, height, actualScale)
 	if err != nil {
 		return err