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

shaderir: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2020-08-02 00:09:12 +09:00
parent fa60e31997
commit 79e252c158
2 changed files with 98 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
internal/shaderir/glsl.go
View File

@ -27,8 +27,7 @@ precision highp float;
#define lowp #define lowp
#define mediump #define mediump
#define highp #define highp
#endif #endif`
`
func isValidSwizzling(s string) bool { func isValidSwizzling(s string) bool {
if len(s) < 1 || 4 < len(s) { if len(s) < 1 || 4 < len(s) {
@ -88,6 +87,10 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
// Vertex func // Vertex func
var vslines []string var vslines []string
{ {
if len(p.Uniforms) > 0 || p.TextureNum > 0 || len(p.Attributes) > 0 || len(p.Varyings) > 0 {
if len(vslines) > 0 && vslines[len(vslines)-1] != "" {
vslines = append(vslines, "")
}
for i, t := range p.Uniforms { for i, t := range p.Uniforms {
vslines = append(vslines, fmt.Sprintf("uniform %s;", p.glslVarDecl(&t, fmt.Sprintf("U%d", i)))) vslines = append(vslines, fmt.Sprintf("uniform %s;", p.glslVarDecl(&t, fmt.Sprintf("U%d", i))))
} }
@ -100,6 +103,7 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
for i, t := range p.Varyings { for i, t := range p.Varyings {
vslines = append(vslines, fmt.Sprintf("varying %s;", p.glslVarDecl(&t, fmt.Sprintf("V%d", i)))) vslines = append(vslines, fmt.Sprintf("varying %s;", p.glslVarDecl(&t, fmt.Sprintf("V%d", i))))
} }
}
if len(p.Funcs) > 0 { if len(p.Funcs) > 0 {
if len(vslines) > 0 && vslines[len(vslines)-1] != "" { if len(vslines) > 0 && vslines[len(vslines)-1] != "" {
vslines = append(vslines, "") vslines = append(vslines, "")
@ -128,6 +132,10 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
// Fragment func // Fragment func
var fslines []string var fslines []string
{ {
if len(p.Uniforms) > 0 || p.TextureNum > 0 || len(p.Varyings) > 0 {
if len(fslines) > 0 && fslines[len(fslines)-1] != "" {
fslines = append(fslines, "")
}
for i, t := range p.Uniforms { for i, t := range p.Uniforms {
fslines = append(fslines, fmt.Sprintf("uniform %s;", p.glslVarDecl(&t, fmt.Sprintf("U%d", i)))) fslines = append(fslines, fmt.Sprintf("uniform %s;", p.glslVarDecl(&t, fmt.Sprintf("U%d", i))))
} }
@ -137,6 +145,7 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
for i, t := range p.Varyings { for i, t := range p.Varyings {
fslines = append(fslines, fmt.Sprintf("varying %s;", p.glslVarDecl(&t, fmt.Sprintf("V%d", i)))) fslines = append(fslines, fmt.Sprintf("varying %s;", p.glslVarDecl(&t, fmt.Sprintf("V%d", i))))
} }
}
if len(p.Funcs) > 0 { if len(p.Funcs) > 0 {
if len(fslines) > 0 && fslines[len(fslines)-1] != "" { if len(fslines) > 0 && fslines[len(fslines)-1] != "" {
fslines = append(fslines, "") fslines = append(fslines, "")
@ -162,7 +171,12 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
} }
} }
var tmpvslines []string
tmpfslines := strings.Split(GlslFragmentPrelude, "\n")
// Struct types are determined after converting the program.
var stlines []string var stlines []string
if len(p.structTypes) > 0 {
for i, t := range p.structTypes { for i, t := range p.structTypes {
stlines = append(stlines, fmt.Sprintf("struct S%d {", i)) stlines = append(stlines, fmt.Sprintf("struct S%d {", i))
for j, st := range t.Sub { for j, st := range t.Sub {
@ -171,13 +185,28 @@ func (p *Program) Glsl() (vertexShader, fragmentShader string) {
stlines = append(stlines, "};") stlines = append(stlines, "};")
} }
vslines = append(stlines, vslines...) if len(tmpvslines) > 0 {
tmpvslines = append(tmpvslines, "")
}
tmpvslines = append(stlines, tmpvslines...)
tmp := make([]string, len(stlines)) if len(tmpfslines) > 0 {
copy(tmp, stlines) tmpfslines = append(tmpfslines, "")
fslines = append(tmp, fslines...) }
copied := make([]string, len(stlines))
copy(copied, stlines)
tmpfslines = append(tmpfslines, copied...)
}
fslines = append(strings.Split(GlslFragmentPrelude, "\n"), fslines...) if len(tmpvslines) > 0 && len(vslines) > 0 {
tmpvslines = append(tmpvslines, "")
}
vslines = append(tmpvslines, vslines...)
if len(tmpfslines) > 0 && len(fslines) > 0 {
tmpfslines = append(tmpfslines, "")
}
fslines = append(tmpfslines, fslines...)
return strings.Join(vslines, "\n") + "\n", strings.Join(fslines, "\n") + "\n" return strings.Join(vslines, "\n") + "\n", strings.Join(fslines, "\n") + "\n"
} }

45
internal/shaderir/ir_test.go
View File

@ -149,6 +149,8 @@ func fieldSelectorExpr(a, b Expr) Expr {
} }
func TestOutput(t *testing.T) { func TestOutput(t *testing.T) {
prelude := GlslFragmentPrelude + "\n"
tests := []struct { tests := []struct {
Name string Name string
Program Program Program Program
@ -169,7 +171,7 @@ func TestOutput(t *testing.T) {
}, },
}, },
GlslVS: `uniform float U0;`, GlslVS: `uniform float U0;`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
uniform float U0;`, uniform float U0;`,
}, },
{ {
@ -187,11 +189,13 @@ uniform float U0;`,
GlslVS: `struct S0 { GlslVS: `struct S0 {
float M0; float M0;
}; };
uniform S0 U0;`, uniform S0 U0;`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
struct S0 { struct S0 {
float M0; float M0;
}; };
uniform S0 U0;`, uniform S0 U0;`,
}, },
{ {
@ -210,7 +214,7 @@ uniform S0 U0;`,
GlslVS: `uniform float U0; GlslVS: `uniform float U0;
attribute vec2 A0; attribute vec2 A0;
varying vec3 V0;`, varying vec3 V0;`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
uniform float U0; uniform float U0;
varying vec3 V0;`, varying vec3 V0;`,
}, },
@ -227,7 +231,7 @@ varying vec3 V0;`,
void F0(void) { void F0(void) {
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(void); void F0(void);
void F0(void) { void F0(void) {
@ -254,7 +258,7 @@ void F0(void) {
void F0(in float l0, in vec2 l1, in vec4 l2, out mat4 l3) { void F0(in float l0, in vec2 l1, in vec4 l2, out mat4 l3) {
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, in vec2 l1, in vec4 l2, out mat4 l3); void F0(in float l0, in vec2 l1, in vec4 l2, out mat4 l3);
void F0(in float l0, in vec2 l1, in vec4 l2, out mat4 l3) { void F0(in float l0, in vec2 l1, in vec4 l2, out mat4 l3) {
@ -284,7 +288,7 @@ void F0(in float l0, in vec2 l1, in vec4 l2, out mat4 l3) {
float F0(in float l0) { float F0(in float l0) {
return l0; return l0;
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
float F0(in float l0); float F0(in float l0);
float F0(in float l0) { float F0(in float l0) {
@ -316,7 +320,7 @@ void F0(in float l0, out float l1) {
mat4 l2 = mat4(0); mat4 l2 = mat4(0);
mat4 l3 = mat4(0); mat4 l3 = mat4(0);
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, out float l1); void F0(in float l0, out float l1);
void F0(in float l0, out float l1) { void F0(in float l0, out float l1) {
@ -363,7 +367,7 @@ void F0(in float l0, out float l1) {
mat4 l5 = mat4(0); mat4 l5 = mat4(0);
} }
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, out float l1); void F0(in float l0, out float l1);
void F0(in float l0, out float l1) { void F0(in float l0, out float l1) {
@ -407,7 +411,7 @@ void F0(in float l0, out float l1) {
void F0(in float l0, in float l1, out float l2) { void F0(in float l0, in float l1, out float l2) {
l2 = (l0) + (l1); l2 = (l0) + (l1);
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, in float l1, out float l2); void F0(in float l0, in float l1, out float l2);
void F0(in float l0, in float l1, out float l2) { void F0(in float l0, in float l1, out float l2) {
@ -447,7 +451,7 @@ void F0(in float l0, in float l1, out float l2) {
void F0(in bool l0, in float l1, in float l2, out float l3) { void F0(in bool l0, in float l1, in float l2, out float l3) {
l3 = (l0) ? (l1) : (l2); l3 = (l0) ? (l1) : (l2);
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in bool l0, in float l1, in float l2, out float l3); void F0(in bool l0, in float l1, in float l2, out float l3);
void F0(in bool l0, in float l1, in float l2, out float l3) { void F0(in bool l0, in float l1, in float l2, out float l3) {
@ -492,7 +496,7 @@ void F0(in float l0, in float l1, out vec2 l2) {
F1(); F1();
l2 = F2(l0, l1); l2 = F2(l0, l1);
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, in float l1, out vec2 l2); void F0(in float l0, in float l1, out vec2 l2);
void F0(in float l0, in float l1, out vec2 l2) { void F0(in float l0, in float l1, out vec2 l2) {
@ -532,7 +536,7 @@ void F0(in float l0, in float l1, out vec2 l2) {
void F0(in float l0, in float l1, out float l2) { void F0(in float l0, in float l1, out float l2) {
l2 = min(l0, l1); l2 = min(l0, l1);
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, in float l1, out float l2); void F0(in float l0, in float l1, out float l2);
void F0(in float l0, in float l1, out float l2) { void F0(in float l0, in float l1, out float l2) {
@ -569,7 +573,7 @@ void F0(in float l0, in float l1, out float l2) {
void F0(in vec4 l0, out vec2 l1) { void F0(in vec4 l0, out vec2 l1) {
l1 = (l0).xz; l1 = (l0).xz;
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in vec4 l0, out vec2 l1); void F0(in vec4 l0, out vec2 l1);
void F0(in vec4 l0, out vec2 l1) { void F0(in vec4 l0, out vec2 l1) {
@ -625,7 +629,7 @@ void F0(in float l0, in float l1, out float l2) {
l2 = l1; l2 = l1;
} }
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, in float l1, out float l2); void F0(in float l0, in float l1, out float l2);
void F0(in float l0, in float l1, out float l2) { void F0(in float l0, in float l1, out float l2) {
@ -676,7 +680,7 @@ void F0(in float l0, in float l1, out float l2) {
l2 = l0; l2 = l0;
} }
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
void F0(in float l0, in float l1, out float l2); void F0(in float l0, in float l1, out float l2);
void F0(in float l0, in float l1, out float l2) { void F0(in float l0, in float l1, out float l2) {
@ -730,7 +734,7 @@ void main(void) {
V0 = A1; V0 = A1;
V1 = A2; V1 = A2;
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
uniform float U0; uniform float U0;
varying float V0; varying float V0;
varying vec2 V1;`, varying vec2 V1;`,
@ -800,7 +804,7 @@ void main(void) {
V0 = A1; V0 = A1;
V1 = A2; V1 = A2;
}`, }`,
GlslFS: GlslFragmentPrelude + ` GlslFS: prelude + `
uniform float U0; uniform float U0;
varying float V0; varying float V0;
varying vec2 V1; varying vec2 V1;
@ -815,20 +819,23 @@ void main(void) {
}, },
} }
for _, tc := range tests { for _, tc := range tests {
tc := tc
t.Run(tc.Name, func(t *testing.T) {
vs, fs := tc.Program.Glsl() vs, fs := tc.Program.Glsl()
{ {
got := vs got := vs
want := tc.GlslVS + "\n" want := tc.GlslVS + "\n"
if got != want { if got != want {
t.Errorf("%s: got: %s, want: %s", tc.Name, got, want) t.Errorf("%s vertex: got: %s, want: %s", tc.Name, got, want)
} }
} }
{ {
got := fs got := fs
want := tc.GlslFS + "\n" want := tc.GlslFS + "\n"
if got != want { if got != want {
t.Errorf("%s: got: %s, want: %s", tc.Name, got, want) t.Errorf("%s fragment: got: %s, want: %s", tc.Name, got, want)
} }
} }
})
} }
} }