mstar/canvas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more efficient alpha texture loading

Browse source
This commit is contained in:
Thomas Friedel 2020-03-21 16:34:19 +01:00
parent 7830bb2cc5
commit 59ddfe59c1
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
backend/goglbackend/fill.go
View file

@ -171,15 +171,12 @@ func (b *GoGLBackend) FillImageMask(style *backendbase.FillStyle, mask *image.Al
gl.ActiveTexture(gl.TEXTURE1) gl.ActiveTexture(gl.TEXTURE1)
gl.BindTexture(gl.TEXTURE_2D, b.alphaTex) gl.BindTexture(gl.TEXTURE_2D, b.alphaTex)
for y := 0; y < h; y++ { gl.TexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, int32(mask.Stride), int32(h), gl.ALPHA, gl.UNSIGNED_BYTE, gl.Ptr(&mask.Pix[0]))
off := y * mask.Stride if w < alphaTexSize {
gl.TexSubImage2D(gl.TEXTURE_2D, 0, 0, int32(alphaTexSize-1-y), int32(w), 1, gl.ALPHA, gl.UNSIGNED_BYTE, gl.Ptr(&mask.Pix[off])) gl.TexSubImage2D(gl.TEXTURE_2D, 0, int32(w), 0, 1, int32(h), gl.ALPHA, gl.UNSIGNED_BYTE, gl.Ptr(&zeroes[0]))
} }
if h < alphaTexSize { if h < alphaTexSize {
gl.TexSubImage2D(gl.TEXTURE_2D, 0, 0, int32(alphaTexSize-1-h), int32(w), 1, gl.ALPHA, gl.UNSIGNED_BYTE, gl.Ptr(&zeroes[0])) gl.TexSubImage2D(gl.TEXTURE_2D, 0, 0, int32(h), int32(w), 1, gl.ALPHA, gl.UNSIGNED_BYTE, gl.Ptr(&zeroes[0]))
}
if w < alphaTexSize {
gl.TexSubImage2D(gl.TEXTURE_2D, 0, int32(w), int32(alphaTexSize-1-h), 1, int32(h), gl.ALPHA, gl.UNSIGNED_BYTE, gl.Ptr(&zeroes[0]))
} }
if style.Blur > 0 { if style.Blur > 0 {
@ -205,7 +202,7 @@ func (b *GoGLBackend) FillImageMask(style *backendbase.FillStyle, mask *image.Al
for _, pt := range pts { for _, pt := range pts {
data = append(data, float32(pt[0]), float32(pt[1])) data = append(data, float32(pt[0]), float32(pt[1]))
} }
data = append(data, 0, 1, 0, float32(1-th), float32(tw), float32(1-th), float32(tw), 1) data = append(data, 0, 0, 0, float32(th), float32(tw), float32(th), float32(tw), 0)
gl.BufferData(gl.ARRAY_BUFFER, len(data)*4, unsafe.Pointer(&data[0]), gl.STREAM_DRAW) gl.BufferData(gl.ARRAY_BUFFER, len(data)*4, unsafe.Pointer(&data[0]), gl.STREAM_DRAW)

15
backend/xmobilebackend/fill.go
View file

@ -171,9 +171,12 @@ func (b *XMobileBackend) FillImageMask(style *backendbase.FillStyle, mask *image
b.glctx.ActiveTexture(gl.TEXTURE1) b.glctx.ActiveTexture(gl.TEXTURE1)
b.glctx.BindTexture(gl.TEXTURE_2D, b.alphaTex) b.glctx.BindTexture(gl.TEXTURE_2D, b.alphaTex)
for y := 0; y < h; y++ { b.glctx.TexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, mask.Stride, h, gl.ALPHA, gl.UNSIGNED_BYTE, mask.Pix[0:])
off := y * mask.Stride if w < alphaTexSize {
b.glctx.TexSubImage2D(gl.TEXTURE_2D, 0, 0, alphaTexSize-1-y, w, 1, gl.ALPHA, gl.UNSIGNED_BYTE, mask.Pix[off:]) b.glctx.TexSubImage2D(gl.TEXTURE_2D, 0, w, 0, 1, h, gl.ALPHA, gl.UNSIGNED_BYTE, zeroes[0:])
}
if h < alphaTexSize {
b.glctx.TexSubImage2D(gl.TEXTURE_2D, 0, 0, h, w, 1, gl.ALPHA, gl.UNSIGNED_BYTE, zeroes[0:])
} }
if style.Blur > 0 { if style.Blur > 0 {
@ -199,7 +202,7 @@ func (b *XMobileBackend) FillImageMask(style *backendbase.FillStyle, mask *image
for _, pt := range pts { for _, pt := range pts {
data = append(data, float32(pt[0]), float32(pt[1])) data = append(data, float32(pt[0]), float32(pt[1]))
} }
data = append(data, 0, 1, 0, float32(1-th), float32(tw), float32(1-th), float32(tw), 1) data = append(data, 0, 0, 0, float32(th), float32(tw), float32(th), float32(tw), 0)
b.glctx.BufferData(gl.ARRAY_BUFFER, byteSlice(unsafe.Pointer(&data[0]), len(data)*4), gl.STREAM_DRAW) b.glctx.BufferData(gl.ARRAY_BUFFER, byteSlice(unsafe.Pointer(&data[0]), len(data)*4), gl.STREAM_DRAW)
@ -215,10 +218,6 @@ func (b *XMobileBackend) FillImageMask(style *backendbase.FillStyle, mask *image
b.glctx.StencilFunc(gl.ALWAYS, 0, 0xFF) b.glctx.StencilFunc(gl.ALWAYS, 0, 0xFF)
for y := 0; y < h; y++ {
b.glctx.TexSubImage2D(gl.TEXTURE_2D, 0, 0, alphaTexSize-1-y, w, 1, gl.ALPHA, gl.UNSIGNED_BYTE, zeroes[0:])
}
b.glctx.ActiveTexture(gl.TEXTURE0) b.glctx.ActiveTexture(gl.TEXTURE0)
if style.Blur > 0 { if style.Blur > 0 {