mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-23 17:32:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

shader: Bug fix: selector is not available on a blank identifier

Browse Source
This commit is contained in:
Hajime Hoshi 2020-09-14 03:41:25 +09:00
parent e1d8629189
commit ded223ead0
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/shader/expr.go
View File

@ -437,7 +437,7 @@ func (cs *compileState) parseExpr(block *block, expr ast.Expr, markLocalVariable
return cs.parseExpr(block, e.X, markLocalVariableUsed) return cs.parseExpr(block, e.X, markLocalVariableUsed)
case *ast.SelectorExpr: case *ast.SelectorExpr:
exprs, _, stmts, ok := cs.parseExpr(block, e.X, markLocalVariableUsed) exprs, _, stmts, ok := cs.parseExpr(block, e.X, true)
if !ok { if !ok {
return nil, nil, nil, false return nil, nil, nil, false
} }

16
shader_test.go
View File

@ -572,8 +572,8 @@ func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
x.x = 1 x.x = 1
return vec4(0) return vec4(0)
} }
`)); err == nil { `)); err != nil {
t.Errorf("error must be non-nil but was nil") t.Error(err)
} }
// Increment statement treats a variable 'used'. // Increment statement treats a variable 'used'.
@ -590,7 +590,7 @@ func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
} }
} }
func TestShaderBlankRhs(t *testing.T) { func TestShaderBlankLhs(t *testing.T) {
if _, err := NewShader([]byte(`package main if _, err := NewShader([]byte(`package main
func Fragment(position vec4, texCoord vec2, color vec4) vec4 { func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
@ -652,6 +652,16 @@ func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
_ += 1 _ += 1
return vec4(0) return vec4(0)
} }
`)); err == nil {
t.Errorf("error must be non-nil but was nil")
}
if _, err := NewShader([]byte(`package main
func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
_.x = 1
return vec4(0)
}
`)); err == nil { `)); err == nil {
t.Errorf("error must be non-nil but was nil") t.Errorf("error must be non-nil but was nil")
} }