internal/restorable: refactoring

This commit is contained in:
Hajime Hoshi 2024-09-08 19:29:41 +09:00
parent bbe3cba110
commit 73565034a9

View File

@ -80,7 +80,7 @@ func (p *Pixels) Dispose() {
// drawTrianglesHistoryItem is an item for history of draw-image commands. // drawTrianglesHistoryItem is an item for history of draw-image commands.
type drawTrianglesHistoryItem struct { type drawTrianglesHistoryItem struct {
images [graphics.ShaderSrcImageCount]*Image srcImages [graphics.ShaderSrcImageCount]*Image
vertices []float32 vertices []float32
indices []uint32 indices []uint32
blend graphicsdriver.Blend blend graphicsdriver.Blend
@ -454,7 +454,7 @@ func (i *Image) appendDrawTrianglesHistory(srcs [graphics.ShaderSrcImageCount]*I
copy(us, uniforms) copy(us, uniforms)
item := &drawTrianglesHistoryItem{ item := &drawTrianglesHistoryItem{
images: srcs, srcImages: srcs,
vertices: vs, vertices: vs,
indices: is, indices: is,
blend: blend, blend: blend,
@ -593,7 +593,7 @@ func (i *Image) resolveStale(graphicsDriver graphicsdriver.Graphics) error {
// dependsOn reports whether the image depends on src. // dependsOn reports whether the image depends on src.
func (i *Image) dependsOn(src *Image) bool { func (i *Image) dependsOn(src *Image) bool {
for _, c := range i.drawTrianglesHistory { for _, c := range i.drawTrianglesHistory {
for _, img := range c.images { for _, img := range c.srcImages {
if img != src { if img != src {
continue continue
} }
@ -617,7 +617,7 @@ func (i *Image) dependsOnShader(shader *Shader) bool {
func (i *Image) dependingImages() map[*Image]struct{} { func (i *Image) dependingImages() map[*Image]struct{} {
r := map[*Image]struct{}{} r := map[*Image]struct{}{}
for _, c := range i.drawTrianglesHistory { for _, c := range i.drawTrianglesHistory {
for _, img := range c.images { for _, img := range c.srcImages {
if img == nil { if img == nil {
continue continue
} }
@ -671,7 +671,7 @@ func (i *Image) restore(graphicsDriver graphicsdriver.Graphics) error {
for _, c := range i.drawTrianglesHistory { for _, c := range i.drawTrianglesHistory {
var imgs [graphics.ShaderSrcImageCount]*graphicscommand.Image var imgs [graphics.ShaderSrcImageCount]*graphicscommand.Image
for i, img := range c.images { for i, img := range c.srcImages {
if img == nil { if img == nil {
continue continue
} }