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

graphics: Specify indices before commands

Browse Source
This commit is contained in:
Hajime Hoshi 2018-06-10 04:55:44 +09:00
parent 273093b237
commit 8a268e871f
2 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
internal/graphics/command.go
View File

@ -52,6 +52,8 @@ type commandQueue struct {
elements []uint16 elements []uint16
nelements int nelements int
tmpNumElements int
nextIndex int nextIndex int
} }
@ -66,25 +68,21 @@ func (q *commandQueue) appendVertices(vertices []float32) {
} }
// for-loop might be faster than copy: // for-loop might be faster than copy:
// On GopherJS, copy might cause subarray calls. // On GopherJS, copy might cause subarray calls.
for i := 0; i < len(vertices); i++ { for i := range vertices {
q.vertices[q.nvertices+i] = vertices[i] q.vertices[q.nvertices+i] = vertices[i]
} }
q.nvertices += len(vertices) q.nvertices += len(vertices)
} }
func (q *commandQueue) appendElements(e0, e1, e2, e3, e4, e5 uint16) { func (q *commandQueue) appendElements(indices []uint16, offset uint16) {
// For GopherJS performance, take 6 arguments instead of an array. if len(q.elements) < q.nelements+len(indices) {
if len(q.elements) < q.nelements+6 { n := q.nelements + len(indices) - len(q.elements)
n := q.nelements + 6 - len(q.elements)
q.elements = append(q.elements, make([]uint16, n)...) q.elements = append(q.elements, make([]uint16, n)...)
} }
q.elements[q.nelements+0] = e0 for i := range indices {
q.elements[q.nelements+1] = e1 q.elements[q.nelements+i] = indices[i] + offset
q.elements[q.nelements+2] = e2 }
q.elements[q.nelements+3] = e3 q.nelements += len(indices)
q.elements[q.nelements+4] = e4
q.elements[q.nelements+5] = e5
q.nelements += 6
} }
func (q *commandQueue) doEnqueueDrawImageCommand(dst, src *Image, nvertices, nelements int, color *affine.ColorM, mode opengl.CompositeMode, filter Filter, forceNewCommand bool) { func (q *commandQueue) doEnqueueDrawImageCommand(dst, src *Image, nvertices, nelements int, color *affine.ColorM, mode opengl.CompositeMode, filter Filter, forceNewCommand bool) {
@ -111,33 +109,24 @@ func (q *commandQueue) doEnqueueDrawImageCommand(dst, src *Image, nvertices, nel
} }
// EnqueueDrawImageCommand enqueues a drawing-image command. // EnqueueDrawImageCommand enqueues a drawing-image command.
func (q *commandQueue) EnqueueDrawImageCommand(dst, src *Image, vertices []float32, color *affine.ColorM, mode opengl.CompositeMode, filter Filter) { func (q *commandQueue) EnqueueDrawImageCommand(dst, src *Image, vertices []float32, indices []uint16, color *affine.ColorM, mode opengl.CompositeMode, filter Filter) {
// Avoid defer for performance if len(indices) > indicesNum {
q.appendVertices(vertices) panic("not reached")
nq := len(vertices) * opengl.Float.SizeInBytes() / QuadVertexSizeInBytes() }
nv := 0
ne := 0 split := false
for i := 0; i < nq; i++ { if q.tmpNumElements+len(indices) > indicesNum {
if q.nelements%indicesNum >= (q.nelements+6)%indicesNum { q.tmpNumElements = 0
q.nextIndex = 0 q.nextIndex = 0
// Note that even if ne == 0, that's fine. split = true
q.doEnqueueDrawImageCommand(dst, src, nv, ne, color, mode, filter, true)
nv = 0
ne = 0
} }
q.appendElements(
uint16(q.nextIndex+0), q.appendVertices(vertices)
uint16(q.nextIndex+1), q.appendElements(indices, uint16(q.nextIndex))
uint16(q.nextIndex+2), q.nextIndex += len(vertices) * opengl.Float.SizeInBytes() / theArrayBufferLayout.totalBytes()
uint16(q.nextIndex+1), q.tmpNumElements += len(indices)
uint16(q.nextIndex+2),
uint16(q.nextIndex+3), q.doEnqueueDrawImageCommand(dst, src, len(vertices), len(indices), color, mode, filter, split)
)
q.nextIndex += 4
nv += QuadVertexSizeInBytes() / opengl.Float.SizeInBytes()
ne += 6
}
q.doEnqueueDrawImageCommand(dst, src, nv, ne, color, mode, filter, false)
} }
// Enqueue enqueues a drawing command other than a draw-image command. // Enqueue enqueues a drawing command other than a draw-image command.
@ -196,6 +185,7 @@ func (q *commandQueue) Flush() error {
q.commands = nil q.commands = nil
q.nvertices = 0 q.nvertices = 0
q.nelements = 0 q.nelements = 0
q.tmpNumElements = 0
q.nextIndex = 0 q.nextIndex = 0
return nil return nil
} }

22
internal/graphics/image.go
View File

@ -87,7 +87,27 @@ func (i *Image) Size() (int, int) {
} }
func (i *Image) DrawImage(src *Image, vertices []float32, clr *affine.ColorM, mode opengl.CompositeMode, filter Filter) { func (i *Image) DrawImage(src *Image, vertices []float32, clr *affine.ColorM, mode opengl.CompositeMode, filter Filter) {
theCommandQueue.EnqueueDrawImageCommand(i, src, vertices, clr, mode, filter) for len(vertices) > 0 {
var next []float32
nq := len(vertices) * opengl.Float.SizeInBytes() / QuadVertexSizeInBytes()
if nq > maxQuads {
nq = maxQuads
i := nq * QuadVertexSizeInBytes() / opengl.Float.SizeInBytes()
next = vertices[i:]
vertices = vertices[:i]
}
indices := make([]uint16, 6*nq)
for i := 0; i < nq; i++ {
indices[6*i+0] = uint16(4*i + 0)
indices[6*i+1] = uint16(4*i + 1)
indices[6*i+2] = uint16(4*i + 2)
indices[6*i+3] = uint16(4*i + 1)
indices[6*i+4] = uint16(4*i + 2)
indices[6*i+5] = uint16(4*i + 3)
}
theCommandQueue.EnqueueDrawImageCommand(i, src, vertices, indices, clr, mode, filter)
vertices = next
}
} }
func (i *Image) Pixels() ([]byte, error) { func (i *Image) Pixels() ([]byte, error) {