diff --git a/graphicscontext.go b/graphicscontext.go index 70730b362..e53f39344 100644 --- a/graphicscontext.go +++ b/graphicscontext.go @@ -17,7 +17,6 @@ package ebiten import ( "math" - "github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/restorable" "github.com/hajimehoshi/ebiten/internal/ui" ) @@ -76,7 +75,7 @@ func (c *graphicsContext) SetSize(screenWidth, screenHeight int, screenScale flo func (c *graphicsContext) initializeIfNeeded() error { if !c.initialized { - if err := graphics.Reset(); err != nil { + if err := restorable.Reset(); err != nil { return err } c.initialized = true @@ -100,7 +99,7 @@ func drawWithFittingScale(dst *Image, src *Image) { func (c *graphicsContext) drawToDefaultRenderTarget() error { _ = c.screen.Clear() drawWithFittingScale(c.screen, c.offscreen2) - if err := graphics.FlushCommands(); err != nil { + if err := restorable.FlushCommands(); err != nil { return err } return nil @@ -141,7 +140,7 @@ func (c *graphicsContext) restoreIfNeeded() error { if !r { return nil } - if err := graphics.Reset(); err != nil { + if err := restorable.Reset(); err != nil { return err } if err := restorable.Restore(); err != nil { diff --git a/graphicscontext_notjs.go b/graphicscontext_notjs.go index 4032cdf0e..cac18f781 100644 --- a/graphicscontext_notjs.go +++ b/graphicscontext_notjs.go @@ -17,12 +17,12 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/graphics" + "github.com/hajimehoshi/ebiten/internal/restorable" ) func (c *graphicsContext) needsRestoring() (bool, error) { // FlushCommands is required because c.offscreen.impl might not have an actual texture. - if err := graphics.FlushCommands(); err != nil { + if err := restorable.FlushCommands(); err != nil { return false, err } return c.offscreen.restorable.IsInvalidated(), nil diff --git a/image.go b/image.go index faffe5d9e..730a565e4 100644 --- a/image.go +++ b/image.go @@ -20,7 +20,6 @@ import ( "image/color" "runtime" - "github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/math" "github.com/hajimehoshi/ebiten/internal/opengl" "github.com/hajimehoshi/ebiten/internal/restorable" @@ -284,7 +283,7 @@ func newImageWithScreenFramebuffer(width, height int, offsetX, offsetY float64) return i } -const MaxImageSize = graphics.MaxImageSize +const MaxImageSize = restorable.MaxImageSize func checkSize(width, height int) { if width <= 0 { diff --git a/internal/restorable/image.go b/internal/restorable/image.go index f95865c10..2b37aff7b 100644 --- a/internal/restorable/image.go +++ b/internal/restorable/image.go @@ -26,6 +26,12 @@ import ( "github.com/hajimehoshi/ebiten/internal/opengl" ) +const MaxImageSize = graphics.MaxImageSize + +func QuadVertexSizeInBytes() int { + return graphics.QuadVertexSizeInBytes() +} + type drawImageHistoryItem struct { image *Image vertices []float32 diff --git a/internal/restorable/images.go b/internal/restorable/images.go index 51dadd0b1..2d13fe813 100644 --- a/internal/restorable/images.go +++ b/internal/restorable/images.go @@ -15,6 +15,7 @@ package restorable import ( + "github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/sync" ) @@ -164,3 +165,11 @@ func (i *images) clearVolatileImages() { img.clearIfVolatile() } } + +func Reset() error { + return graphics.Reset() +} + +func FlushCommands() error { + return graphics.FlushCommands() +} diff --git a/vertices.go b/vertices.go index 3f195c75d..ec9ba066a 100644 --- a/vertices.go +++ b/vertices.go @@ -16,7 +16,7 @@ package ebiten import ( "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/graphics" + "github.com/hajimehoshi/ebiten/internal/restorable" ) // texelAdjustment represents a number to be used to adjust texel. @@ -26,7 +26,7 @@ import ( const texelAdjustment = 256 var ( - quadFloat32Num = graphics.QuadVertexSizeInBytes() / 4 + quadFloat32Num = restorable.QuadVertexSizeInBytes() / 4 theVerticesBackend = &verticesBackend{} )