Remove textures from ids

graphics.go

@@ -72,7 +72,7 @@ const (
 
 // Texture represents a texture.
 type Texture struct {
-	id int
+	glTexture *opengl.Texture
 }
 
 // RenderTarget represents a render target.

ids.go

@@ -20,13 +20,11 @@ import (
 	"github.com/go-gl/gl"
 	"github.com/hajimehoshi/ebiten/internal/opengl"
 	"github.com/hajimehoshi/ebiten/internal/opengl/internal/shader"
-	"image"
 	"math"
 	"sync"
 )
 
 type ids struct {
-	textures              map[*Texture]*opengl.Texture
 	renderTargets         map[*RenderTarget]*opengl.RenderTarget
 	renderTargetToTexture map[*RenderTarget]*Texture
 	lastID                int
@@ -35,17 +33,10 @@ type ids struct {
 }
 
 var idsInstance = &ids{
-	textures:              map[*Texture]*opengl.Texture{},
 	renderTargets:         map[*RenderTarget]*opengl.RenderTarget{},
 	renderTargetToTexture: map[*RenderTarget]*Texture{},
 }
 
-func (i *ids) textureAt(texture *Texture) *opengl.Texture {
-	i.RLock()
-	defer i.RUnlock()
-	return i.textures[texture]
-}
-
 func (i *ids) renderTargetAt(renderTarget *RenderTarget) *opengl.RenderTarget {
 	i.RLock()
 	defer i.RUnlock()
@@ -58,20 +49,6 @@ func (i *ids) toTexture(renderTarget *RenderTarget) *Texture {
 	return i.renderTargetToTexture[renderTarget]
 }
 
-func (i *ids) createTexture(img image.Image, filter int) (*Texture, error) {
-	glTexture, err := opengl.CreateTextureFromImage(img, filter)
-	if err != nil {
-		return nil, err
-	}
-
-	i.Lock()
-	defer i.Unlock()
-	i.lastID++
-	texture := &Texture{i.lastID}
-	i.textures[texture] = glTexture
-	return texture, nil
-}
-
 func (i *ids) createRenderTarget(width, height int, filter int) (*RenderTarget, error) {
 	glTexture, err := opengl.CreateTexture(width, height, filter)
 	if err != nil {
@@ -87,12 +64,11 @@ func (i *ids) createRenderTarget(width, height int, filter int) (*RenderTarget,
 
 	i.Lock()
 	defer i.Unlock()
-	i.lastID++
+	texture := &Texture{glTexture}
-	texture := &Texture{i.lastID}
 	i.lastID++
 	renderTarget := &RenderTarget{i.lastID}
 
-	i.textures[texture] = glTexture
+	//i.textures[texture] = glTexture
 	i.renderTargets[renderTarget] = r
 	i.renderTargetToTexture[renderTarget] = texture
 
@@ -116,14 +92,13 @@ func (i *ids) deleteRenderTarget(renderTarget *RenderTarget) {
 
 	glRenderTarget := i.renderTargets[renderTarget]
 	texture := i.renderTargetToTexture[renderTarget]
-	glTexture := i.textures[texture]
+	glTexture := texture.glTexture
 
 	glRenderTarget.Dispose()
 	glTexture.Dispose()
 
 	delete(i.renderTargets, renderTarget)
 	delete(i.renderTargetToTexture, renderTarget)
-	delete(i.textures, texture)
 }
 
 func (i *ids) fillRenderTarget(renderTarget *RenderTarget, r, g, b uint8) error {
@@ -137,7 +112,7 @@ func (i *ids) fillRenderTarget(renderTarget *RenderTarget, r, g, b uint8) error
 }
 
 func (i *ids) drawTexture(target *RenderTarget, texture *Texture, parts []TexturePart, geo GeometryMatrix, color ColorMatrix) error {
-	glTexture := i.textureAt(texture)
+	glTexture := texture.glTexture
 	if err := i.setViewportIfNeeded(target); err != nil {
 		return err
 	}

ui.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"github.com/go-gl/gl"
 	glfw "github.com/go-gl/glfw3"
+	"github.com/hajimehoshi/ebiten/internal/opengl"
 	"image"
 	"runtime"
 )
@@ -131,7 +132,11 @@ func (u *ui) newTexture(img image.Image, filter int) (*Texture, error) {
 	var texture *Texture
 	var err error
 	u.use(func() {
-		texture, err = idsInstance.createTexture(img, filter)
+		glTexture, err := opengl.CreateTextureFromImage(img, filter)
+		if err != nil {
+			return
+		}
+		texture = &Texture{glTexture}
 	})
 	return texture, err
 }