mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-19 21:02:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicscommand: bug fix: overflow when len(vertices) > len(indices)

Browse Source 
Closes #1913
This commit is contained in:
Hajime Hoshi 2021-12-26 06:01:43 +09:00
parent 7e46816246
commit f182b185d9
2 changed files with 177 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
image_test.go
View File

@ -2437,3 +2437,167 @@ func BenchmarkColorMScale(b *testing.B) {
dst.DrawImage(src, op)
}
}
func TestIndicesOverflow(t *testing.T) {
const (
w = 16
h = 16
)
dst := ebiten.NewImage(w, h)
src := ebiten.NewImage(w, h)
src.Fill(color.White)
op := &ebiten.DrawTrianglesOptions{}
vs := make([]ebiten.Vertex, 3)
is := make([]uint16, graphics.IndicesNum/3*3)
dst.DrawTriangles(vs, is, src, op)
// Cause an overflow for indices.
vs = []ebiten.Vertex{
{
DstX: 0,
DstY: 0,
SrcX: 0,
SrcY: 0,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
{
DstX: w,
DstY: 0,
SrcX: w,
SrcY: 0,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
{
DstX: 0,
DstY: h,
SrcX: 0,
SrcY: h,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
{
DstX: w,
DstY: h,
SrcX: w,
SrcY: h,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
}
is = []uint16{0, 1, 2, 1, 2, 3}
dst.DrawTriangles(vs, is, src, op)
for j := 0; j < h; j++ {
for i := 0; i < w; i++ {
got := dst.At(i, j)
want := color.RGBA{0xff, 0xff, 0xff, 0xff}
if got != want {
t.Errorf("dst.At(%d, %d): got: %v, want: %v", i, j, got, want)
}
}
}
}
func TestVerticesOverflow(t *testing.T) {
const (
w = 16
h = 16
)
dst := ebiten.NewImage(w, h)
src := ebiten.NewImage(w, h)
src.Fill(color.White)
op := &ebiten.DrawTrianglesOptions{}
vs := make([]ebiten.Vertex, graphics.IndicesNum-1)
is := make([]uint16, 3)
dst.DrawTriangles(vs, is, src, op)
// Cause an overflow for vertices.
vs = []ebiten.Vertex{
{
DstX: 0,
DstY: 0,
SrcX: 0,
SrcY: 0,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
{
DstX: w,
DstY: 0,
SrcX: w,
SrcY: 0,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
{
DstX: 0,
DstY: h,
SrcX: 0,
SrcY: h,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
{
DstX: w,
DstY: h,
SrcX: w,
SrcY: h,
ColorR: 1,
ColorG: 1,
ColorB: 1,
ColorA: 1,
},
}
is = []uint16{0, 1, 2, 1, 2, 3}
dst.DrawTriangles(vs, is, src, op)
for j := 0; j < h; j++ {
for i := 0; i < w; i++ {
got := dst.At(i, j)
want := color.RGBA{0xff, 0xff, 0xff, 0xff}
if got != want {
t.Errorf("dst.At(%d, %d): got: %v, want: %v", i, j, got, want)
}
}
}
}
func TestTooManyVertices(t *testing.T) {
const (
w = 16
h = 16
)
dst := ebiten.NewImage(w, h)
src := ebiten.NewImage(w, h)
src.Fill(color.White)
op := &ebiten.DrawTrianglesOptions{}
vs := make([]ebiten.Vertex, graphics.IndicesNum+1)
is := make([]uint16, 3)
dst.DrawTriangles(vs, is, src, op)
// Force to cause flushing the graphics commands.
// Confirm this doesn't freeze.
dst.At(0, 0)
}

19
internal/graphicscommand/command.go
View File

@ -94,8 +94,8 @@ type commandQueue struct {
indices []uint16
nindices int
tmpNumVertexFloats int
tmpNumIndices int
nextIndex int
drawTrianglesCommandPool drawTrianglesCommandPool
@ -144,6 +144,11 @@ func (q *commandQueue) appendIndices(indices []uint16, offset uint16) {
q.nindices += len(indices)
}
// mustUseDifferentVertexBuffer reports whether a differnt vertex buffer must be used.
func mustUseDifferentVertexBuffer(nextNumVertexFloats, nextNumIndices int) bool {
return nextNumVertexFloats > graphics.IndicesNum*graphics.VertexFloatNum || nextNumIndices > graphics.IndicesNum
}
// EnqueueDrawTrianglesCommand enqueues a drawing-image command.
func (q *commandQueue) EnqueueDrawTrianglesCommand(dst *Image, srcs [graphics.ShaderImageNum]*Image, offsets [graphics.ShaderImageNum - 1][2]float32, vertices []float32, indices []uint16, color affine.ColorM, mode driver.CompositeMode, filter driver.Filter, address driver.Address, dstRegion, srcRegion driver.Region, shader *Shader, uniforms []driver.Uniform, evenOdd bool) {
if len(indices) > graphics.IndicesNum {
@ -151,17 +156,17 @@ func (q *commandQueue) EnqueueDrawTrianglesCommand(dst *Image, srcs [graphics.Sh
}
split := false
if q.tmpNumIndices+len(indices) > graphics.IndicesNum {
if mustUseDifferentVertexBuffer(q.tmpNumVertexFloats+len(vertices), q.tmpNumIndices+len(indices)) {
q.tmpNumVertexFloats = 0
q.tmpNumIndices = 0
q.nextIndex = 0
split = true
}
// Assume that all the image sizes are same.
// Assume that the images are packed from the front in the slice srcs.
q.appendVertices(vertices, srcs[0])
q.appendIndices(indices, uint16(q.nextIndex))
q.nextIndex += len(vertices) / graphics.VertexFloatNum
q.appendIndices(indices, uint16(q.tmpNumVertexFloats/graphics.VertexFloatNum))
q.tmpNumVertexFloats += len(vertices)
q.tmpNumIndices += len(indices)
if srcs[0] != nil {
@ -297,7 +302,7 @@ func (q *commandQueue) flush() error {
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+dtc.numIndices() > graphics.IndicesNum {
if nc > 0 && mustUseDifferentVertexBuffer(nv+dtc.numVertices(), ne+dtc.numIndices()) {
break
}
nv += dtc.numVertices()
@ -339,8 +344,8 @@ func (q *commandQueue) flush() error {
q.commands = q.commands[:0]
q.nvertices = 0
q.nindices = 0
q.tmpNumVertexFloats = 0
q.tmpNumIndices = 0
q.nextIndex = 0
return nil
}