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

shaderir: Bug fix: Early-returns in the entry points didn't work

Browse Source 
Fixes #1238
This commit is contained in:
Hajime Hoshi 2020-07-05 17:47:19 +09:00
parent f4a72165e4
commit 98ae0826c7
4 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,8 @@
void main(void) {
if (true) {
gl_FragColor = gl_FragCoord;
return;
}
gl_FragColor = gl_FragCoord;
return;
}

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

@ -0,0 +1,10 @@
attribute vec2 A0;
void main(void) {
if (true) {
gl_Position = vec4(A0, 0.0, 1.0);
return;
}
gl_Position = vec4(A0, 0.0, 1.0);
return;
}

15
internal/shader/testdata/issue1238.go vendored Normal file
View File

@ -0,0 +1,15 @@
package main
func Vertex(position vec2) vec4 {
if true {
return vec4(position, 0, 1)
}
return vec4(position, 0, 1)
}
func Fragment(position vec4) vec4 {
if true {
return position
}
return position
}

24
internal/shaderir/glsl.go
View File

@ -99,7 +99,7 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
vslines = append(vslines, "")
}
vslines = append(vslines, "void main(void) {")
vslines = append(vslines, p.glslBlock(&p.VertexFunc.Block, 0, 0)...)
vslines = append(vslines, p.glslBlock(&p.VertexFunc.Block, &p.VertexFunc.Block, 0, 0)...)
vslines = append(vslines, "}")
}
}
@ -118,9 +118,11 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
}
if len(p.FragmentFunc.Block.Stmts) > 0 {
if len(fslines) > 0 {
fslines = append(fslines, "")
}
fslines = append(fslines, "void main(void) {")
fslines = append(fslines, p.glslBlock(&p.FragmentFunc.Block, 0, 0)...)
fslines = append(fslines, p.glslBlock(&p.FragmentFunc.Block, &p.FragmentFunc.Block, 0, 0)...)
fslines = append(fslines, "}")
}
}
@ -217,17 +219,17 @@ func (p *Program) glslFunc(f *Func) []string {
var lines []string
lines = append(lines, fmt.Sprintf("%s F%d(%s) {", p.glslType(&f.Return), f.Index, argsstr))
lines = append(lines, p.glslBlock(&f.Block, 0, idx)...)
lines = append(lines, p.glslBlock(&f.Block, &f.Block, 0, idx)...)
lines = append(lines, "}")
return lines
}
func (p *Program) glslBlock(b *Block, level int, localVarIndex int) []string {
func (p *Program) glslBlock(topBlock, block *Block, level int, localVarIndex int) []string {
idt := strings.Repeat("\t", level+1)
var lines []string
for _, t := range b.LocalVars {
for _, t := range block.LocalVars {
lines = append(lines, fmt.Sprintf("%s%s = %s;", idt, p.glslVarDecl(&t, fmt.Sprintf("l%d", localVarIndex)), p.glslVarInit(&t)))
localVarIndex++
}
@ -265,7 +267,7 @@ func (p *Program) glslBlock(b *Block, level int, localVarIndex int) []string {
return fmt.Sprintf("U%d", e.Index)
case LocalVariable:
idx := e.Index
switch b {
switch topBlock {
case &p.VertexFunc.Block:
na := len(p.Attributes)
nv := len(p.Varyings)
@ -334,23 +336,23 @@ func (p *Program) glslBlock(b *Block, level int, localVarIndex int) []string {
}
}
for _, s := range b.Stmts {
for _, s := range block.Stmts {
switch s.Type {
case ExprStmt:
lines = append(lines, fmt.Sprintf("%s%s;", idt, glslExpr(&s.Exprs[0])))
case BlockStmt:
lines = append(lines, idt+"{")
lines = append(lines, p.glslBlock(&s.Blocks[0], level+1, localVarIndex)...)
lines = append(lines, p.glslBlock(topBlock, &s.Blocks[0], level+1, localVarIndex)...)
lines = append(lines, idt+"}")
case Assign:
// TODO: Give an appropriate context
lines = append(lines, fmt.Sprintf("%s%s = %s;", idt, glslExpr(&s.Exprs[0]), glslExpr(&s.Exprs[1])))
case If:
lines = append(lines, fmt.Sprintf("%sif (%s) {", idt, glslExpr(&s.Exprs[0])))
lines = append(lines, p.glslBlock(&s.Blocks[0], level+1, localVarIndex)...)
lines = append(lines, p.glslBlock(topBlock, &s.Blocks[0], level+1, localVarIndex)...)
if len(s.Blocks) > 1 {
lines = append(lines, fmt.Sprintf("%s} else {", idt))
lines = append(lines, p.glslBlock(&s.Blocks[1], level+1, localVarIndex)...)
lines = append(lines, p.glslBlock(topBlock, &s.Blocks[1], level+1, localVarIndex)...)
}
lines = append(lines, fmt.Sprintf("%s}", idt))
case For:
@ -379,7 +381,7 @@ func (p *Program) glslBlock(b *Block, level int, localVarIndex int) []string {
op = fmt.Sprintf("?(unexpected op: %s)", string(s.ForOp))
}
lines = append(lines, fmt.Sprintf("%sfor (int l%d = %d; l%d %s %d; %s) {", idt, v, s.ForInit, v, op, s.ForEnd, delta))
lines = append(lines, p.glslBlock(&s.Blocks[0], level+1, localVarIndex)...)
lines = append(lines, p.glslBlock(topBlock, &s.Blocks[0], level+1, localVarIndex)...)
lines = append(lines, fmt.Sprintf("%s}", idt))
case Continue:
lines = append(lines, idt+"continue;")