joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-07 18:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal/ops: don't run deferred macros twice

Browse Source 
Discovered while debugging #277.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-09-24 15:08:12 +02:00
parent 72c67ff180
commit 3434bf8af1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpu/internal/rendertest/refs/TestDeferredPaint.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 487 B

gpu/internal/rendertest/render_test.go
+3 -3
View File
@@ -107,13 +107,13 @@ func TestDeferredPaint(t *testing.T) {
run(t, func(o *op.Ops) { run(t, func(o *op.Ops) {
state := op.Save(o) state := op.Save(o)
clip.Rect(image.Rect(0, 0, 80, 80)).Op().Add(o) clip.Rect(image.Rect(0, 0, 80, 80)).Op().Add(o)
paint.ColorOp{Color: color.NRGBA{A: 0xff, G: 0xff}}.Add(o) paint.ColorOp{Color: color.NRGBA{A: 0x60, G: 0xff}}.Add(o)
paint.PaintOp{}.Add(o) paint.PaintOp{}.Add(o)
op.Affine(f32.Affine2D{}.Offset(f32.Pt(20, 20))).Add(o) op.Affine(f32.Affine2D{}.Offset(f32.Pt(20, 20))).Add(o)
m := op.Record(o) m := op.Record(o)
clip.Rect(image.Rect(0, 0, 80, 80)).Op().Add(o) clip.Rect(image.Rect(0, 0, 80, 80)).Op().Add(o)
paint.ColorOp{Color: color.NRGBA{A: 0xff, R: 0xff, G: 0xff}}.Add(o) paint.ColorOp{Color: color.NRGBA{A: 0x60, R: 0xff, G: 0xff}}.Add(o)
paint.PaintOp{}.Add(o) paint.PaintOp{}.Add(o)
paintMacro := m.Stop() paintMacro := m.Stop()
op.Defer(o, paintMacro) op.Defer(o, paintMacro)
@@ -121,7 +121,7 @@ func TestDeferredPaint(t *testing.T) {
state.Load() state.Load()
op.Affine(f32.Affine2D{}.Offset(f32.Pt(10, 10))).Add(o) op.Affine(f32.Affine2D{}.Offset(f32.Pt(10, 10))).Add(o)
clip.Rect(image.Rect(0, 0, 80, 80)).Op().Add(o) clip.Rect(image.Rect(0, 0, 80, 80)).Op().Add(o)
paint.ColorOp{Color: color.NRGBA{A: 0xff, B: 0xff}}.Add(o) paint.ColorOp{Color: color.NRGBA{A: 0x60, B: 0xff}}.Add(o)
paint.PaintOp{}.Add(o) paint.PaintOp{}.Add(o)
}, func(r result) { }, func(r result) {
}) })
internal/ops/reader.go
+2
View File
@@ -134,6 +134,8 @@ func (r *Reader) Decode() (EncodedOp, bool) {
} }
deferData := r.deferOps.Write1(t.Size(), refs[0]) deferData := r.deferOps.Write1(t.Size(), refs[0])
copy(deferData, data) copy(deferData, data)
r.pc.data += n
r.pc.refs += nrefs
continue continue
} }
var op macroOp var op macroOp