mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 11:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicscommand: Refactoring: Use type assesion instead of interface

Browse Source 
This was an optimization in GopherJS era. This change removes this
to simplify the implementation.
This commit is contained in:
Hajime Hoshi 2021-07-05 21:16:01 +09:00
parent b2d4521e22
commit 92b3dab33c
1 changed files with 22 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
internal/graphicscommand/command.go
View File

@ -51,11 +51,6 @@ type command interface {
fmt.Stringer fmt.Stringer
Exec(indexOffset int) error Exec(indexOffset int) error
NumVertices() int
NumIndices() int
AddNumVertices(n int)
AddNumIndices(n int)
CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, evenOdd bool) bool
} }
type size struct { type size struct {
@ -167,12 +162,14 @@ func (q *commandQueue) EnqueueDrawTrianglesCommand(dst *Image, srcs [graphics.Sh
// TODO: If dst is the screen, reorder the command to be the last. // TODO: If dst is the screen, reorder the command to be the last.
if !split && 0 < len(q.commands) { if !split && 0 < len(q.commands) {
// TODO: Pass offsets and uniforms when merging considers the shader. // TODO: Pass offsets and uniforms when merging considers the shader.
if last := q.commands[len(q.commands)-1]; last.CanMergeWithDrawTrianglesCommand(dst, srcs, color, mode, filter, address, dstRegion, srcRegion, shader, evenOdd) { if last, ok := q.commands[len(q.commands)-1].(*drawTrianglesCommand); ok {
last.AddNumVertices(len(vertices)) if last.CanMergeWithDrawTrianglesCommand(dst, srcs, color, mode, filter, address, dstRegion, srcRegion, shader, evenOdd) {
last.AddNumIndices(len(indices)) last.addNumVertices(len(vertices))
last.addNumIndices(len(indices))
return return
} }
} }
}
c := &drawTrianglesCommand{ c := &drawTrianglesCommand{
dst: dst, dst: dst,
@ -263,14 +260,16 @@ func (q *commandQueue) flush() error {
ne := 0 ne := 0
nc := 0 nc := 0
for _, c := range cs { for _, c := range cs {
if c.NumIndices() > graphics.IndicesNum { if dtc, ok := c.(*drawTrianglesCommand); ok {
panic(fmt.Sprintf("graphicscommand: c.NumIndices() must be <= graphics.IndicesNum but not at Flush: c.NumIndices(): %d, graphics.IndicesNum: %d", c.NumIndices(), graphics.IndicesNum)) if dtc.numIndices() > graphics.IndicesNum {
panic(fmt.Sprintf("graphicscommand: dtc.NumIndices() must be <= graphics.IndicesNum but not at Flush: dtc.NumIndices(): %d, graphics.IndicesNum: %d", dtc.numIndices(), graphics.IndicesNum))
} }
if ne+c.NumIndices() > graphics.IndicesNum { if ne+dtc.numIndices() > graphics.IndicesNum {
break break
} }
nv += c.NumVertices() nv += dtc.numVertices()
ne += c.NumIndices() ne += dtc.numIndices()
}
nc++ nc++
} }
if 0 < ne { if 0 < ne {
@ -287,7 +286,9 @@ func (q *commandQueue) flush() error {
// TODO: indexOffset should be reset if the command type is different // TODO: indexOffset should be reset if the command type is different
// from the previous one. This fix is needed when another drawing command is // from the previous one. This fix is needed when another drawing command is
// introduced than drawTrianglesCommand. // introduced than drawTrianglesCommand.
indexOffset += c.NumIndices() if dtc, ok := c.(*drawTrianglesCommand); ok {
indexOffset += dtc.numIndices()
}
} }
cs = cs[nc:] cs = cs[nc:]
} }
@ -433,19 +434,19 @@ func (c *drawTrianglesCommand) Exec(indexOffset int) error {
return theGraphicsDriver.DrawTriangles(c.dst.image.ID(), imgs, c.offsets, shaderID, c.nindices, indexOffset, c.mode, c.color, c.filter, c.address, c.dstRegion, c.srcRegion, c.uniforms, c.evenOdd) return theGraphicsDriver.DrawTriangles(c.dst.image.ID(), imgs, c.offsets, shaderID, c.nindices, indexOffset, c.mode, c.color, c.filter, c.address, c.dstRegion, c.srcRegion, c.uniforms, c.evenOdd)
} }
func (c *drawTrianglesCommand) NumVertices() int { func (c *drawTrianglesCommand) numVertices() int {
return c.nvertices return c.nvertices
} }
func (c *drawTrianglesCommand) NumIndices() int { func (c *drawTrianglesCommand) numIndices() int {
return c.nindices return c.nindices
} }
func (c *drawTrianglesCommand) AddNumVertices(n int) { func (c *drawTrianglesCommand) addNumVertices(n int) {
c.nvertices += n c.nvertices += n
} }
func (c *drawTrianglesCommand) AddNumIndices(n int) { func (c *drawTrianglesCommand) addNumIndices(n int) {
c.nindices += n c.nindices += n
} }
@ -504,24 +505,6 @@ func (c *replacePixelsCommand) Exec(indexOffset int) error {
return nil return nil
} }
func (c *replacePixelsCommand) NumVertices() int {
return 0
}
func (c *replacePixelsCommand) NumIndices() int {
return 0
}
func (c *replacePixelsCommand) AddNumVertices(n int) {
}
func (c *replacePixelsCommand) AddNumIndices(n int) {
}
func (c *replacePixelsCommand) CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, evenOdd bool) bool {
return false
}
type pixelsCommand struct { type pixelsCommand struct {
result []byte result []byte
img *Image img *Image
@ -541,24 +524,6 @@ func (c *pixelsCommand) String() string {
return fmt.Sprintf("pixels: image: %d", c.img.id) return fmt.Sprintf("pixels: image: %d", c.img.id)
} }
func (c *pixelsCommand) NumVertices() int {
return 0
}
func (c *pixelsCommand) NumIndices() int {
return 0
}
func (c *pixelsCommand) AddNumVertices(n int) {
}
func (c *pixelsCommand) AddNumIndices(n int) {
}
func (c *pixelsCommand) CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, evenOdd bool) bool {
return false
}
// disposeImageCommand represents a command to dispose an image. // disposeImageCommand represents a command to dispose an image.
type disposeImageCommand struct { type disposeImageCommand struct {
target *Image target *Image
@ -574,24 +539,6 @@ func (c *disposeImageCommand) Exec(indexOffset int) error {
return nil return nil
} }
func (c *disposeImageCommand) NumVertices() int {
return 0
}
func (c *disposeImageCommand) NumIndices() int {
return 0
}
func (c *disposeImageCommand) AddNumVertices(n int) {
}
func (c *disposeImageCommand) AddNumIndices(n int) {
}
func (c *disposeImageCommand) CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, evenOdd bool) bool {
return false
}
// disposeShaderCommand represents a command to dispose a shader. // disposeShaderCommand represents a command to dispose a shader.
type disposeShaderCommand struct { type disposeShaderCommand struct {
target *Shader target *Shader
@ -607,24 +554,6 @@ func (c *disposeShaderCommand) Exec(indexOffset int) error {
return nil return nil
} }
func (c *disposeShaderCommand) NumVertices() int {
return 0
}
func (c *disposeShaderCommand) NumIndices() int {
return 0
}
func (c *disposeShaderCommand) AddNumVertices(n int) {
}
func (c *disposeShaderCommand) AddNumIndices(n int) {
}
func (c *disposeShaderCommand) CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, evenOdd bool) bool {
return false
}
// newImageCommand represents a command to create an empty image with given width and height. // newImageCommand represents a command to create an empty image with given width and height.
type newImageCommand struct { type newImageCommand struct {
result *Image result *Image
@ -646,24 +575,6 @@ func (c *newImageCommand) Exec(indexOffset int) error {
return nil return nil
} }
func (c *newImageCommand) NumVertices() int {
return 0
}
func (c *newImageCommand) NumIndices() int {
return 0
}
func (c *newImageCommand) AddNumVertices(n int) {
}
func (c *newImageCommand) AddNumIndices(n int) {
}
func (c *newImageCommand) CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, evenOdd bool) bool {
return false
}
// newScreenFramebufferImageCommand is a command to create a special image for the screen. // newScreenFramebufferImageCommand is a command to create a special image for the screen.
type newScreenFramebufferImageCommand struct { type newScreenFramebufferImageCommand struct {
result *Image result *Image
@ -682,24 +593,6 @@ func (c *newScreenFramebufferImageCommand) Exec(indexOffset int) error {
return err return err
} }
func (c *newScreenFramebufferImageCommand) NumVertices() int {
return 0
}
func (c *newScreenFramebufferImageCommand) NumIndices() int {
return 0
}
func (c *newScreenFramebufferImageCommand) AddNumVertices(n int) {
}
func (c *newScreenFramebufferImageCommand) AddNumIndices(n int) {
}
func (c *newScreenFramebufferImageCommand) CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, copmlex bool) bool {
return false
}
// newShaderCommand is a command to create a shader. // newShaderCommand is a command to create a shader.
type newShaderCommand struct { type newShaderCommand struct {
result *Shader result *Shader
@ -717,24 +610,6 @@ func (c *newShaderCommand) Exec(indexOffset int) error {
return err return err
} }
func (c *newShaderCommand) NumVertices() int {
return 0
}
func (c *newShaderCommand) NumIndices() int {
return 0
}
func (c *newShaderCommand) AddNumVertices(n int) {
}
func (c *newShaderCommand) AddNumIndices(n int) {
}
func (c *newShaderCommand) CanMergeWithDrawTrianglesCommand(dst *Image, src [graphics.ShaderImageNum]*Image, color *affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, evenOdd bool) bool {
return false
}
// ResetGraphicsDriverState resets or initializes the current graphics driver state. // ResetGraphicsDriverState resets or initializes the current graphics driver state.
func ResetGraphicsDriverState() error { func ResetGraphicsDriverState() error {
return runOnMainThread(func() error { return runOnMainThread(func() error {