Make CreateTexture/RenderTarget synchronous

example/blocks/game.go

@@ -3,6 +3,7 @@ package blocks
 import (
 	"github.com/hajimehoshi/go-ebiten/graphics"
 	"github.com/hajimehoshi/go-ebiten/ui"
+	_ "image/png"
 )
 
 type Size struct {

example/blocks/textures.go

@@ -3,7 +3,6 @@ package blocks
 import (
 	"github.com/hajimehoshi/go-ebiten/graphics"
 	"image"
-	_ "image/png"
 	"os"
 	"sync"
 )
@@ -64,36 +63,30 @@ func (t *Textures) loop() {
 				if err != nil {
 					panic(err)
 				}
-				ch := t.textureFactory.CreateTexture(
+				id, err := t.textureFactory.CreateTexture(
 					img,
 					graphics.FilterNearest)
-				go func() {
+				if err != nil {
-					e := <-ch
+					panic(err)
-					if e.Error != nil {
+				}
-						panic(e.Error)
+				t.Lock()
-					}
+				defer t.Unlock()
-					t.Lock()
+				t.textures[name] = id
-					defer t.Unlock()
-					t.textures[name] = e.Id
-				}()
 			}()
 		case s := <-t.renderTargetSizes:
 			name := s.name
 			size := s.size
 			go func() {
-				ch := t.textureFactory.CreateRenderTarget(
+				id, err := t.textureFactory.CreateRenderTarget(
 					size.Width,
 					size.Height,
 					graphics.FilterNearest)
-				go func() {
+				if err != nil {
-					e := <-ch
+					panic(err)
-					if e.Error != nil {
+				}
-						panic(e.Error)
+				t.Lock()
-					}
+				defer t.Unlock()
-					t.Lock()
+				t.renderTargets[name] = id
-					defer t.Unlock()
-					t.renderTargets[name] = e.Id
-				}()
 			}()
 		}
 	}

graphics/texture_factory.go

@@ -17,17 +17,7 @@ type TextureId int
 // all alpha of a render target is maximum.
 type RenderTargetId int
 
-type TextureCreatedEvent struct {
-	Id    TextureId
-	Error error
-}
-
-type RenderTargetCreatedEvent struct {
-	Id    RenderTargetId
-	Error error
-}
-
 type TextureFactory interface {
-	CreateRenderTarget(width, height int, filter Filter) <-chan RenderTargetCreatedEvent
+	CreateRenderTarget(width, height int, filter Filter) (RenderTargetId, error)
-	CreateTexture(img image.Image, filter Filter) <-chan TextureCreatedEvent
+	CreateTexture(img image.Image, filter Filter) (TextureId, error)
 }

ui/cocoa/shared_context.go

@@ -73,40 +73,24 @@ func (t *sharedContext) createGameWindow(width, height, scale int, title string)
 
 func (t *sharedContext) CreateTexture(
 	img image.Image,
-	filter graphics.Filter) <-chan graphics.TextureCreatedEvent {
+	filter graphics.Filter) (graphics.TextureId, error) {
-	ch := make(chan graphics.TextureCreatedEvent)
+	<-t.inited
-	go func() {
+	var id graphics.TextureId
-		<-t.inited
+	var err error
-		var id graphics.TextureId
+	t.useGLContext(func() {
-		var err error
+		id, err = opengl.CreateTexture(img, filter)
-		t.useGLContext(func() {
+	})
-			id, err = opengl.CreateTexture(img, filter)
+	return id, err
-		})
-		ch <- graphics.TextureCreatedEvent{
-			Id:    id,
-			Error: err,
-		}
-		close(ch)
-	}()
-	return ch
 }
 
 func (t *sharedContext) CreateRenderTarget(
 	width, height int,
-	filter graphics.Filter) <-chan graphics.RenderTargetCreatedEvent {
+	filter graphics.Filter) (graphics.RenderTargetId, error) {
-	ch := make(chan graphics.RenderTargetCreatedEvent)
+	<-t.inited
-	go func() {
+	var id graphics.RenderTargetId
-		<-t.inited
+	var err error
-		var id graphics.RenderTargetId
+	t.useGLContext(func() {
-		var err error
+		id, err = opengl.CreateRenderTarget(width, height, filter)
-		t.useGLContext(func() {
+	})
-			id, err = opengl.CreateRenderTarget(width, height, filter)
+	return id, err
-		})
-		ch <- graphics.RenderTargetCreatedEvent{
-			Id:    id,
-			Error: err,
-		}
-		close(ch)
-	}()
-	return ch
 }