regenerated

This commit is contained in:
Thomas Friedel 2019-04-24 12:35:11 +02:00
parent 0476a8a85f
commit 7d0fc7ceb8
3 changed files with 3 additions and 10 deletions

View file

@ -7,7 +7,6 @@ import (
) )
func (b *XMobileBackend) ClearClip() { func (b *XMobileBackend) ClearClip() {
b.curClip = nil
b.activate() b.activate()
b.glctx.StencilMask(0xFF) b.glctx.StencilMask(0xFF)
@ -15,9 +14,7 @@ func (b *XMobileBackend) ClearClip() {
} }
func (b *XMobileBackend) Clip(pts [][2]float64) { func (b *XMobileBackend) Clip(pts [][2]float64) {
b.curClip = nil
b.activate() b.activate()
b.curClip = pts
b.ptsBuf = b.ptsBuf[:0] b.ptsBuf = b.ptsBuf[:0]
b.ptsBuf = append(b.ptsBuf, b.ptsBuf = append(b.ptsBuf,
@ -41,6 +38,7 @@ func (b *XMobileBackend) Clip(pts [][2]float64) {
b.glctx.UseProgram(b.sr.ID) b.glctx.UseProgram(b.sr.ID)
b.glctx.Uniform4f(b.sr.Color, 1, 1, 1, 1) b.glctx.Uniform4f(b.sr.Color, 1, 1, 1, 1)
b.glctx.Uniform2f(b.sr.CanvasSize, float32(b.fw), float32(b.fh)) b.glctx.Uniform2f(b.sr.CanvasSize, float32(b.fw), float32(b.fh))
b.glctx.Uniform1f(b.sr.GlobalAlpha, 1)
b.glctx.EnableVertexAttribArray(b.sr.Vertex) b.glctx.EnableVertexAttribArray(b.sr.Vertex)
b.glctx.ColorMask(false, false, false, false) b.glctx.ColorMask(false, false, false, false)

View file

@ -115,6 +115,7 @@ func (b *XMobileBackend) Fill(style *backendbase.FillStyle, pts [][2]float64) {
b.glctx.UseProgram(b.sr.ID) b.glctx.UseProgram(b.sr.ID)
b.glctx.Uniform4f(b.sr.Color, 0, 0, 0, 0) b.glctx.Uniform4f(b.sr.Color, 0, 0, 0, 0)
b.glctx.Uniform2f(b.sr.CanvasSize, float32(b.fw), float32(b.fh)) b.glctx.Uniform2f(b.sr.CanvasSize, float32(b.fw), float32(b.fh))
b.glctx.Uniform1f(b.sr.GlobalAlpha, 1)
b.glctx.EnableVertexAttribArray(b.sr.Vertex) b.glctx.EnableVertexAttribArray(b.sr.Vertex)
b.glctx.VertexAttribPointer(b.sr.Vertex, 2, gl.FLOAT, false, 0, 0) b.glctx.VertexAttribPointer(b.sr.Vertex, 2, gl.FLOAT, false, 0, 0)

View file

@ -211,8 +211,6 @@ type XMobileBackend struct {
*GLContext *GLContext
curClip [][2]float64
activateFn func() activateFn func()
disableTextureRenderTarget func() disableTextureRenderTarget func()
} }
@ -241,11 +239,7 @@ func New(x, y, w, h int, ctx *GLContext) (*XMobileBackend, error) {
b.activateFn = func() { b.activateFn = func() {
b.glctx.BindFramebuffer(gl.FRAMEBUFFER, gl.Framebuffer{Value: 0}) b.glctx.BindFramebuffer(gl.FRAMEBUFFER, gl.Framebuffer{Value: 0})
b.glctx.Viewport(b.x, b.y, b.w, b.h) b.glctx.Viewport(b.x, b.y, b.w, b.h)
b.glctx.Clear(gl.STENCIL_BUFFER_BIT) // todo reapply clipping since another application may have used the stencil buffer
if c := b.curClip; c != nil {
b.curClip = nil
b.Clip(c)
}
} }
b.disableTextureRenderTarget = func() { b.disableTextureRenderTarget = func() {
b.glctx.BindFramebuffer(gl.FRAMEBUFFER, gl.Framebuffer{Value: 0}) b.glctx.BindFramebuffer(gl.FRAMEBUFFER, gl.Framebuffer{Value: 0})