Remove render targets from ids

graphics.go

@@ -79,7 +79,8 @@ type Texture struct {
 // A render target is essentially same as a texture, but it is assumed that the
 // all alpha values of a render target is maximum.
 type RenderTarget struct {
-	id int
+	glRenderTarget *opengl.RenderTarget
+	texture        *Texture
 }
 
 func u(x int, width int) float32 {

ids.go

@@ -21,32 +21,16 @@ import (
 	"github.com/hajimehoshi/ebiten/internal/opengl"
 	"github.com/hajimehoshi/ebiten/internal/opengl/internal/shader"
 	"math"
-	"sync"
 )
 
 type ids struct {
-	renderTargets         map[*RenderTarget]*opengl.RenderTarget
-	renderTargetToTexture map[*RenderTarget]*Texture
-	lastID                int
 	currentRenderTarget *RenderTarget
-	sync.RWMutex
 }
 
-var idsInstance = &ids{
+var idsInstance = &ids{}
-	renderTargets:         map[*RenderTarget]*opengl.RenderTarget{},
-	renderTargetToTexture: map[*RenderTarget]*Texture{},
-}
-
-func (i *ids) renderTargetAt(renderTarget *RenderTarget) *opengl.RenderTarget {
-	i.RLock()
-	defer i.RUnlock()
-	return i.renderTargets[renderTarget]
-}
 
 func (i *ids) toTexture(renderTarget *RenderTarget) *Texture {
-	i.RLock()
+	return renderTarget.texture
-	defer i.RUnlock()
-	return i.renderTargetToTexture[renderTarget]
 }
 
 func (i *ids) createRenderTarget(width, height int, filter int) (*RenderTarget, error) {
@@ -57,48 +41,30 @@ func (i *ids) createRenderTarget(width, height int, filter int) (*RenderTarget,
 
 	// The current binded framebuffer can be changed.
 	i.currentRenderTarget = nil
-	r, err := opengl.NewRenderTargetFromTexture(glTexture)
+	glRenderTarget, err := opengl.NewRenderTargetFromTexture(glTexture)
 	if err != nil {
 		return nil, err
 	}
 
-	i.Lock()
-	defer i.Unlock()
 	texture := &Texture{glTexture}
-	i.lastID++
+	renderTarget := &RenderTarget{glRenderTarget, texture}
-	renderTarget := &RenderTarget{i.lastID}
-
-	//i.textures[texture] = glTexture
-	i.renderTargets[renderTarget] = r
-	i.renderTargetToTexture[renderTarget] = texture
 
 	return renderTarget, nil
 }
 
 // NOTE: renderTarget can't be used as a texture.
 func (i *ids) addRenderTarget(glRenderTarget *opengl.RenderTarget) *RenderTarget {
-	i.Lock()
+	return &RenderTarget{glRenderTarget, nil}
-	defer i.Unlock()
-	i.lastID++
-	renderTarget := &RenderTarget{i.lastID}
-	i.renderTargets[renderTarget] = glRenderTarget
-
-	return renderTarget
 }
 
 func (i *ids) deleteRenderTarget(renderTarget *RenderTarget) {
-	i.Lock()
-	defer i.Unlock()
 
-	glRenderTarget := i.renderTargets[renderTarget]
+	glRenderTarget := renderTarget.glRenderTarget
-	texture := i.renderTargetToTexture[renderTarget]
+	texture := renderTarget.texture
 	glTexture := texture.glTexture
 
 	glRenderTarget.Dispose()
 	glTexture.Dispose()
-
-	delete(i.renderTargets, renderTarget)
-	delete(i.renderTargetToTexture, renderTarget)
 }
 
 func (i *ids) fillRenderTarget(renderTarget *RenderTarget, r, g, b uint8) error {
@@ -116,17 +82,15 @@ func (i *ids) drawTexture(target *RenderTarget, texture *Texture, parts []Textur
 	if err := i.setViewportIfNeeded(target); err != nil {
 		return err
 	}
-	r := i.renderTargetAt(target)
+	projectionMatrix := target.glRenderTarget.ProjectionMatrix()
-	projectionMatrix := r.ProjectionMatrix()
 	quads := textureQuads(parts, glTexture.Width(), glTexture.Height())
 	shader.DrawTexture(glTexture.Native(), projectionMatrix, quads, &geo, &color)
 	return nil
 }
 
 func (i *ids) setViewportIfNeeded(renderTarget *RenderTarget) error {
-	r := i.renderTargetAt(renderTarget)
 	if i.currentRenderTarget != renderTarget {
-		if err := r.SetAsViewport(); err != nil {
+		if err := renderTarget.glRenderTarget.SetAsViewport(); err != nil {
 			return err
 		}
 		i.currentRenderTarget = renderTarget