From 6fa8c02d4ad5e123bdb9567cc695f6f61486ff7b Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 5 Aug 2023 02:12:15 +0900 Subject: [PATCH] internal/shader: bug fix: div between a matrix and a flaot failed Closes #2719 --- internal/shader/expr.go | 2 ++ shader_test.go | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/internal/shader/expr.go b/internal/shader/expr.go index 901887375..d364ce377 100644 --- a/internal/shader/expr.go +++ b/internal/shader/expr.go @@ -196,6 +196,8 @@ func (cs *compileState) parseExpr(block *block, fname string, expr ast.Expr, mar t = lhst case op2 == shaderir.MatrixMul && lhst.IsMatrix() && rhst.IsFloatVector(): t = rhst + case op2 == shaderir.Div && lhst.IsMatrix() && rhst.Main == shaderir.Float: + t = lhst case lhst.Main == shaderir.Float && rhst.IsFloatVector(): t = rhst case lhst.Main == shaderir.Int && rhst.IsIntVector(): diff --git a/shader_test.go b/shader_test.go index 92d2248e3..e32549471 100644 --- a/shader_test.go +++ b/shader_test.go @@ -2112,3 +2112,39 @@ func Fragment(position vec4, texCoord vec2, color vec4) vec4 { } } } + +// Issue #2719 +func TestShaderMatrixDivFloat(t *testing.T) { + const w, h = 16, 16 + + src := ebiten.NewImage(w, h) + src.Fill(color.RGBA{R: 0x10, G: 0x20, B: 0x30, A: 0xff}) + + dst := ebiten.NewImage(w, h) + s, err := ebiten.NewShader([]byte(`//kage:unit pixels + +package main + +func Fragment(position vec4, texCoord vec2, color vec4) vec4 { + var x = 2.0 + return mat4(3) / x * imageSrc0At(texCoord); +} +`)) + if err != nil { + t.Fatal(err) + } + + op := &ebiten.DrawRectShaderOptions{} + op.Images[0] = src + dst.DrawRectShader(w, h, s, op) + + for j := 0; j < h; j++ { + for i := 0; i < w; i++ { + got := dst.At(i, j).(color.RGBA) + want := color.RGBA{R: 0x18, G: 0x30, B: 0x48, A: 0xff} + if !sameColors(got, want, 2) { + t.Errorf("dst.At(%d, %d): got: %v, want: %v", i, j, got, want) + } + } + } +}