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

shader: Enable to specify entrypoint names

Browse Source
This commit is contained in:
Hajime Hoshi 2020-06-05 01:11:39 +09:00
parent d0aa18ddb9
commit 3dbf4c0a83
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/shader/shader.go
View File

@ -25,11 +25,6 @@ import (
"github.com/hajimehoshi/ebiten/internal/shaderir" "github.com/hajimehoshi/ebiten/internal/shaderir"
) )
const (
vertexEntry = "Vertex"
fragmentEntry = "Fragment"
)
type variable struct { type variable struct {
name string name string
typ typ typ typ
@ -52,6 +47,9 @@ type function struct {
type compileState struct { type compileState struct {
fs *token.FileSet fs *token.FileSet
vertexEntry string
fragmentEntry string
ir shaderir.Program ir shaderir.Program
// uniforms is a collection of uniform variable names. // uniforms is a collection of uniform variable names.
@ -108,7 +106,7 @@ func (p *ParseError) Error() string {
return strings.Join(p.errs, "\n") return strings.Join(p.errs, "\n")
} }
func Compile(src []byte) (*shaderir.Program, error) { func Compile(src []byte, vertexEntry, fragmentEntry string) (*shaderir.Program, error) {
fs := token.NewFileSet() fs := token.NewFileSet()
f, err := parser.ParseFile(fs, "", src, parser.AllErrors) f, err := parser.ParseFile(fs, "", src, parser.AllErrors)
if err != nil { if err != nil {
@ -116,7 +114,9 @@ func Compile(src []byte) (*shaderir.Program, error) {
} }
s := &compileState{ s := &compileState{
fs: fs, fs: fs,
vertexEntry: vertexEntry,
fragmentEntry: fragmentEntry,
} }
s.parse(f) s.parse(f)
@ -205,9 +205,9 @@ func (cs *compileState) parseDecl(b *block, d ast.Decl) {
f := cs.parseFunc(b, d) f := cs.parseFunc(b, d)
if b == &cs.global { if b == &cs.global {
switch d.Name.Name { switch d.Name.Name {
case vertexEntry: case cs.vertexEntry:
cs.ir.VertexFunc.Block = f.ir.Block cs.ir.VertexFunc.Block = f.ir.Block
case fragmentEntry: case cs.fragmentEntry:
cs.ir.FragmentFunc.Block = f.ir.Block cs.ir.FragmentFunc.Block = f.ir.Block
default: default:
b.funcs = append(b.funcs, f) b.funcs = append(b.funcs, f)
@ -328,7 +328,7 @@ func (cs *compileState) parseFunc(block *block, d *ast.FuncDecl) function {
if block == &cs.global { if block == &cs.global {
switch d.Name.Name { switch d.Name.Name {
case vertexEntry: case cs.vertexEntry:
for _, t := range inT { for _, t := range inT {
cs.ir.Attributes = append(cs.ir.Attributes, t) cs.ir.Attributes = append(cs.ir.Attributes, t)
} }
@ -352,7 +352,7 @@ func (cs *compileState) parseFunc(block *block, d *ast.FuncDecl) function {
} }
} }
cs.varyingParsed = true cs.varyingParsed = true
case fragmentEntry: case cs.fragmentEntry:
if len(inParams) == 0 { if len(inParams) == 0 {
cs.addError(d.Pos(), fmt.Sprintf("fragment entry point must have at least one vec4 parameter for a position")) cs.addError(d.Pos(), fmt.Sprintf("fragment entry point must have at least one vec4 parameter for a position"))
return function{} return function{}

2
internal/shader/shader_test.go
View File

@ -211,7 +211,7 @@ void main(void) {
} }
for _, tc := range tests { for _, tc := range tests {
t.Run(tc.Name, func(t *testing.T) { t.Run(tc.Name, func(t *testing.T) {
s, err := Compile([]byte(tc.Src)) s, err := Compile([]byte(tc.Src), "Vertex", "Fragment")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return

2
shader.go
View File

@ -24,7 +24,7 @@ type Shader struct {
} }
func NewShader(src []byte) (*Shader, error) { func NewShader(src []byte) (*Shader, error) {
s, err := shader.Compile(src) s, err := shader.Compile(src, "Vertex", "Fragment")
if err != nil { if err != nil {
return nil, err return nil, err
} }