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

shaderir: Add Program.UniformNames

Browse Source 
Updates #1324
This commit is contained in:
Hajime Hoshi 2020-09-06 03:41:13 +09:00
parent ac30377297
commit 29c7b7687f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/shader/shader.go
View File

@ -50,9 +50,6 @@ type compileState struct {
ir shaderir.Program
// uniforms is a collection of uniform variable names.
uniforms []string
funcs []function
global block
@ -72,7 +69,7 @@ func (cs *compileState) findFunction(name string) (int, bool) {
}
func (cs *compileState) findUniformVariable(name string) (int, bool) {
for i, u := range cs.uniforms {
for i, u := range cs.ir.UniformNames {
if u == name {
return i, true
}
@ -188,20 +185,20 @@ func (cs *compileState) parse(f *ast.File) {
// Sort the uniform variable so that special variable starting with __ should come first.
var unames []string
var utypes []shaderir.Type
for i, u := range cs.uniforms {
for i, u := range cs.ir.UniformNames {
if strings.HasPrefix(u, "__") {
unames = append(unames, u)
utypes = append(utypes, cs.ir.Uniforms[i])
}
}
// TODO: Check len(unames) == graphics.PreservedUniformVariablesNum. Unfortunately this is not true on tests.
for i, u := range cs.uniforms {
for i, u := range cs.ir.UniformNames {
if !strings.HasPrefix(u, "__") {
unames = append(unames, u)
utypes = append(utypes, cs.ir.Uniforms[i])
}
}
cs.uniforms = unames
cs.ir.UniformNames = unames
cs.ir.Uniforms = utypes
// Parse function names so that any other function call the others.
@ -300,7 +297,7 @@ func (cs *compileState) parseDecl(b *block, d ast.Decl) ([]shaderir.Stmt, bool)
cs.addError(s.Names[i].Pos(), fmt.Sprintf("global variables must be exposed: %s", v.name))
}
}
cs.uniforms = append(cs.uniforms, v.name)
cs.ir.UniformNames = append(cs.ir.UniformNames, v.name)
cs.ir.Uniforms = append(cs.ir.Uniforms, v.typ)
}
continue

1
internal/shaderir/program.go
View File

@ -22,6 +22,7 @@ import (
)
type Program struct {
UniformNames []string
Uniforms []Type
TextureNum int
Attributes []Type