mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-12-25 11:18:54 +01:00
shader: Add tests for uniform variables
This commit is contained in:
Hajime Hoshi
parent
e7323e04bf
commit
1ede103ce6
@ -46,16 +46,10 @@ type function struct {
|
||||
type compileState struct {
|
||||
fs *token.FileSet
|
||||
|
||||
result *shaderir.Program
|
||||
ir shaderir.Program
|
||||
|
||||
// position is the field name of VertexOut that represents a vertex position (gl_Position in GLSL).
|
||||
position variable
|
||||
|
||||
// varyings is a collection of varying variables.
|
||||
varyings []variable
|
||||
|
||||
// uniforms is a collection of uniform variables.
|
||||
uniforms []variable
|
||||
// uniforms is a collection of uniform variable names.
|
||||
uniforms []string
|
||||
|
||||
global block
|
||||
|
||||
@ -90,7 +84,7 @@ func Compile(src []byte) (*shaderir.Program, error) {
|
||||
// TODO: Resolve constants
|
||||
|
||||
// TODO: Make a call graph and reorder the elements.
|
||||
return s.result, nil
|
||||
return &s.ir, nil
|
||||
}
|
||||
|
||||
func (s *compileState) addError(pos token.Pos, str string) {
|
||||
@ -135,7 +129,8 @@ func (cs *compileState) parseDecl(b *block, d ast.Decl, global bool) {
|
||||
cs.addError(s.Names[i].Pos(), fmt.Sprintf("global variables must be exposed: %s", v.name))
|
||||
}
|
||||
// TODO: Check RHS
|
||||
cs.uniforms = append(cs.uniforms, v)
|
||||
cs.uniforms = append(cs.uniforms, v.name)
|
||||
cs.ir.Uniforms = append(cs.ir.Uniforms, v.typ.ir)
|
||||
}
|
||||
}
|
||||
case token.IMPORT:
|
||||
@ -150,24 +145,6 @@ func (cs *compileState) parseDecl(b *block, d ast.Decl, global bool) {
|
||||
}
|
||||
}
|
||||
|
||||
func (cs *compileState) parseStruct(t *ast.TypeSpec) {
|
||||
s, ok := t.Type.(*ast.StructType)
|
||||
if !ok {
|
||||
cs.addError(t.Type.Pos(), fmt.Sprintf("%s must be a struct but not", t.Name))
|
||||
return
|
||||
}
|
||||
|
||||
for _, f := range s.Fields.List {
|
||||
t := cs.parseType(f.Type)
|
||||
for _, n := range f.Names {
|
||||
cs.varyings = append(cs.varyings, variable{
|
||||
name: n.Name,
|
||||
typ: t,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (s *compileState) parseVariable(block *block, vs *ast.ValueSpec) []variable {
|
||||
var t typ
|
||||
if vs.Type != nil {
|
||||
@ -324,10 +301,11 @@ func (s *compileState) detectType(b *block, expr ast.Expr) typ {
|
||||
}
|
||||
}
|
||||
if e.Kind == token.INT {
|
||||
s.addError(expr.Pos(), fmt.Sprintf("integer literal is not implemented yet: %s", e.Value))
|
||||
} else {
|
||||
s.addError(expr.Pos(), fmt.Sprintf("unexpected literal: %s", e.Value))
|
||||
return typ{
|
||||
ir: shaderir.Type{Main: shaderir.Int},
|
||||
}
|
||||
}
|
||||
s.addError(expr.Pos(), fmt.Sprintf("unexpected literal: %s", e.Value))
|
||||
return typ{}
|
||||
case *ast.CompositeLit:
|
||||
return s.parseType(e.Type)
|
||||
@ -339,9 +317,9 @@ func (s *compileState) detectType(b *block, expr ast.Expr) typ {
|
||||
}
|
||||
}
|
||||
if b == &s.global {
|
||||
for _, v := range s.uniforms {
|
||||
if v.name == n {
|
||||
return v.typ
|
||||
for i, v := range s.uniforms {
|
||||
if v == n {
|
||||
return typ{ir: s.ir.Uniforms[i]}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -27,116 +27,19 @@ func TestDump(t *testing.T) {
|
||||
VS string
|
||||
FS string
|
||||
}{
|
||||
/*{
|
||||
Name: "general",
|
||||
Src: `package main
|
||||
{
|
||||
Name: "uniforms",
|
||||
Src: `package main
|
||||
|
||||
type VertexOut struct {
|
||||
Position vec4 ` + "`kage:\"position\"`" + `
|
||||
TexCoord vec2
|
||||
Color vec4
|
||||
}
|
||||
|
||||
var Foo float
|
||||
var (
|
||||
Bar vec2
|
||||
Baz, Quux vec3
|
||||
)
|
||||
|
||||
const C1 float = 1
|
||||
const C2, C3 float = 2, 3
|
||||
|
||||
func F1(a, b vec2) vec4 {
|
||||
var c0 vec2 = a
|
||||
var c1, c2 = c0, 1.0
|
||||
c1.x = c2.x
|
||||
c3 := vec4{c0, c1}
|
||||
return c2
|
||||
}
|
||||
`,
|
||||
Dump: `var Bar uniform vec2
|
||||
var Baz uniform vec3
|
||||
var Foo uniform float
|
||||
var Quux uniform vec3
|
||||
type VertexOut struct {
|
||||
Position vec4
|
||||
TexCoord vec2
|
||||
Color vec4
|
||||
}
|
||||
const C1 float = 1
|
||||
const C2 float = 2
|
||||
const C3 float = 3
|
||||
func F1(a vec2, b vec2) (_ vec4) {
|
||||
var c0 vec2 = a
|
||||
var c1 vec2 = c0
|
||||
var c2 vec2 = 1.0
|
||||
var c3 vec4
|
||||
c1.x = c2.x
|
||||
c3 = vec4{c0, c1}
|
||||
return c2
|
||||
}
|
||||
`,
|
||||
},
|
||||
{
|
||||
Name: "AutoType",
|
||||
Src: `package main
|
||||
|
||||
var V0 = 0.0
|
||||
func F() {
|
||||
v1 := V0
|
||||
}
|
||||
`,
|
||||
Dump: `var V0 uniform float
|
||||
func F() {
|
||||
var v1 float
|
||||
v1 = V0
|
||||
}
|
||||
`,
|
||||
},
|
||||
{
|
||||
Name: "AutoType2",
|
||||
Src: `package main
|
||||
|
||||
var V0 = 0.0
|
||||
func F() {
|
||||
v1 := V0
|
||||
{
|
||||
v2 := v1
|
||||
}
|
||||
}
|
||||
`,
|
||||
Dump: `var V0 uniform float
|
||||
func F() {
|
||||
var v1 float
|
||||
v1 = V0
|
||||
{
|
||||
var v2 float
|
||||
v2 = v1
|
||||
}
|
||||
}
|
||||
`,
|
||||
},*/
|
||||
/*{
|
||||
Name: "Struct",
|
||||
Src: `package main
|
||||
|
||||
type S struct {
|
||||
M0 float
|
||||
M1, M2 vec2
|
||||
M3, M4, M5 vec3
|
||||
}
|
||||
`,
|
||||
Dump: `var V0 uniform float
|
||||
type S struct {
|
||||
M0 float
|
||||
M1 vec2
|
||||
M2 vec2
|
||||
M3 vec3
|
||||
M4 vec3
|
||||
M5 vec3
|
||||
}
|
||||
`,
|
||||
},*/
|
||||
var (
|
||||
Foo vec2
|
||||
Boo vec4
|
||||
)`,
|
||||
VS: `uniform vec2 U0;
|
||||
uniform vec4 U1;`,
|
||||
FS: `uniform vec2 U0;
|
||||
uniform vec4 U1;`,
|
||||
},
|
||||
}
|
||||
for _, tc := range tests {
|
||||
s, err := Compile([]byte(tc.Src))
|
||||
@ -145,10 +48,10 @@ func TestDump(t *testing.T) {
|
||||
continue
|
||||
}
|
||||
vs, fs := s.Glsl()
|
||||
if got, want := vs, tc.VS; got != want {
|
||||
if got, want := vs, tc.VS+"\n"; got != want {
|
||||
t.Errorf("%s: got: %v, want: %v", tc.Name, got, want)
|
||||
}
|
||||
if got, want := fs, tc.FS; got != want {
|
||||
if got, want := fs, tc.FS+"\n"; got != want {
|
||||
t.Errorf("%s: got: %v, want: %v", tc.Name, got, want)
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user