fix race condition in GLTriangles

This commit is contained in:
faiface 2017-04-11 15:02:58 +02:00
parent a555999120
commit f2a0a19f6e
1 changed files with 26 additions and 11 deletions

View File

@ -2,6 +2,7 @@ package pixelgl
import (
"fmt"
"sync"
"github.com/faiface/glhf"
"github.com/faiface/mainthread"
@ -16,6 +17,7 @@ type GLTriangles struct {
vs *glhf.VertexSlice
data []float32
shader *glhf.Shader
updateLock sync.Mutex
}
var (
@ -75,6 +77,7 @@ func (gt *GLTriangles) SetLen(len int) {
if len < gt.Len() {
gt.data = gt.data[:len*gt.vs.Stride()]
}
gt.submitData()
}
// Slice returns a sub-Triangles of this GLTriangles in range [i, j).
@ -142,14 +145,26 @@ func (gt *GLTriangles) updateData(t pixel.Triangles) {
}
func (gt *GLTriangles) submitData() {
data := append([]float32{}, gt.data...) // avoid race condition
// this code is supposed to copy the vertex data and CallNonBlock the update if
// the data is small enough, otherwise it'll block and not copy the data
if len(gt.data) < 256 { // arbitrary heurestic constant
data := append([]float32{}, gt.data...)
mainthread.CallNonBlock(func() {
gt.vs.Begin()
dataLen := len(data) / gt.vs.Stride()
gt.vs.SetLen(dataLen)
gt.vs.SetVertexData(data)
gt.vs.End()
})
} else {
mainthread.Call(func() {
gt.vs.Begin()
dataLen := len(gt.data) / gt.vs.Stride()
gt.vs.SetLen(dataLen)
gt.vs.SetVertexData(gt.data)
gt.vs.End()
})
}
}
// Update copies vertex properties from the supplied Triangles into this GLTriangles.