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

shader: Bug fix: Wrong local variable names at for-loop

Browse Source 
Fixes #1245
This commit is contained in:
Hajime Hoshi 2020-07-13 22:49:11 +09:00
parent 0e6f4fccc0
commit 385ff8efdf
4 changed files with 74 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/shader/testdata/issue1245.expected.fs vendored Normal file
View File

@ -0,0 +1,8 @@
void main(void) {
vec4 l0 = vec4(0);
for (int l1 = 0; l1 < 4; l1++) {
(l0).x = ((l0).x) + ((l1) * (1.000000000e-02));
}
gl_FragColor = l0;
return;
}

10
internal/shader/testdata/issue1245.expected.vs vendored Normal file
View File

@ -0,0 +1,10 @@
attribute vec2 A0;
void main(void) {
vec4 l0 = vec4(0);
for (int l1 = 0; l1 < 4; l1++) {
(l0).x = ((l0).x) + ((l1) * (1.000000000e-02));
}
gl_Position = l0;
return;
}

17
internal/shader/testdata/issue1245.go vendored Normal file
View File

@ -0,0 +1,17 @@
package main
func Vertex(position vec2) vec4 {
var v vec4
for i := 0; i < 4.0; i++ {
v.x += i * 0.01
}
return v
}
func Fragment(position vec4) vec4 {
var v vec4
for i := 0; i < 4.0; i++ {
v.x += i * 0.01
}
return v
}

75
internal/shaderir/glsl.go
View File

@ -260,6 +260,38 @@ func constantToNumberLiteral(t ConstType, v constant.Value) string {
return fmt.Sprintf("?(unexpected literal: %s)", v)
}
func (p *Program) localVariableName(topBlock *Block, idx int) string {
switch topBlock {
case &p.VertexFunc.Block:
na := len(p.Attributes)
nv := len(p.Varyings)
switch {
case idx < na:
return fmt.Sprintf("A%d", idx)
case idx == na:
return "gl_Position"
case idx < na+nv+1:
return fmt.Sprintf("V%d", idx-na-1)
default:
return fmt.Sprintf("l%d", idx-(na+nv+1))
}
case &p.FragmentFunc.Block:
nv := len(p.Varyings)
switch {
case idx == 0:
return "gl_FragCoord"
case idx < nv+1:
return fmt.Sprintf("V%d", idx-1)
case idx == nv+1:
return "gl_FragColor"
default:
return fmt.Sprintf("l%d", idx-(nv+2))
}
default:
return fmt.Sprintf("l%d", idx)
}
}
func (p *Program) glslBlock(topBlock, block *Block, level int, localVarIndex int) []string {
idt := strings.Repeat("\t", level+1)
@ -282,36 +314,7 @@ func (p *Program) glslBlock(topBlock, block *Block, level int, localVarIndex int
case TextureVariable:
return fmt.Sprintf("T%d", e.Index)
case LocalVariable:
idx := e.Index
switch topBlock {
case &p.VertexFunc.Block:
na := len(p.Attributes)
nv := len(p.Varyings)
switch {
case idx < na:
return fmt.Sprintf("A%d", idx)
case idx == na:
return "gl_Position"
case idx < na+nv+1:
return fmt.Sprintf("V%d", idx-na-1)
default:
return fmt.Sprintf("l%d", idx-(na+nv+1))
}
case &p.FragmentFunc.Block:
nv := len(p.Varyings)
switch {
case idx == 0:
return "gl_FragCoord"
case idx < nv+1:
return fmt.Sprintf("V%d", idx-1)
case idx == nv+1:
return "gl_FragColor"
default:
return fmt.Sprintf("l%d", idx-(nv+2))
}
default:
return fmt.Sprintf("l%d", idx)
}
return p.localVariableName(topBlock, e.Index)
case StructMember:
return fmt.Sprintf("M%d", e.Index)
case BuiltinFuncExpr:
@ -380,22 +383,22 @@ func (p *Program) glslBlock(topBlock, block *Block, level int, localVarIndex int
ct = ConstTypeFloat
}
v := s.ForVarIndex
v := p.localVariableName(topBlock, s.ForVarIndex)
var delta string
switch val, _ := constant.Float64Val(s.ForDelta); val {
case 0:
delta = fmt.Sprintf("?(unexpected delta: %v)", s.ForDelta)
case 1:
delta = fmt.Sprintf("l%d++", v)
delta = fmt.Sprintf("%s++", v)
case -1:
delta = fmt.Sprintf("l%d--", v)
delta = fmt.Sprintf("%s--", v)
default:
d := s.ForDelta
if val > 0 {
delta = fmt.Sprintf("l%d += %s", v, constantToNumberLiteral(ct, d))
delta = fmt.Sprintf("%s += %s", v, constantToNumberLiteral(ct, d))
} else {
d = constant.UnaryOp(token.SUB, d, 0)
delta = fmt.Sprintf("l%d -= %s", v, constantToNumberLiteral(ct, d))
delta = fmt.Sprintf("%s -= %s", v, constantToNumberLiteral(ct, d))
}
}
var op string
@ -409,7 +412,7 @@ func (p *Program) glslBlock(topBlock, block *Block, level int, localVarIndex int
t := s.ForVarType.Main
init := constantToNumberLiteral(ct, s.ForInit)
end := constantToNumberLiteral(ct, s.ForEnd)
lines = append(lines, fmt.Sprintf("%sfor (%s l%d = %s; l%d %s %s; %s) {", idt, t.Glsl(), v, init, v, op, end, delta))
lines = append(lines, fmt.Sprintf("%sfor (%s %s = %s; %s %s %s; %s) {", idt, t.Glsl(), v, init, v, op, end, delta))
lines = append(lines, p.glslBlock(topBlock, &s.Blocks[0], level+1, localVarIndex)...)
lines = append(lines, fmt.Sprintf("%s}", idt))
case Continue: