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

shaderir: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2020-05-17 02:45:03 +09:00
parent e1d0800f19
commit 8a6140a92f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/shaderir/glsl.go
View File

@ -228,10 +228,10 @@ func (p *Program) glslBlock(b *Block, level int, localVarIndex int) []string {
case BuiltinFuncExpr: case BuiltinFuncExpr:
return string(e.BuiltinFunc) return string(e.BuiltinFunc)
case SwizzlingExpr: case SwizzlingExpr:
if !isValidSwizzling(e.Swizzling) { if !isValidSwizzling(e.Ident) {
return fmt.Sprintf("?(unexpected swizzling: %s)", e.Swizzling) return fmt.Sprintf("?(unexpected swizzling: %s)", e.Ident)
} }
return e.Swizzling return e.Ident
case Ident: case Ident:
return e.Ident return e.Ident
case Unary: case Unary:

4
internal/shaderir/ir_test.go
View File

@ -100,8 +100,8 @@ func builtinFuncExpr(f BuiltinFunc) Expr {
func swizzlingExpr(swizzling string) Expr { func swizzlingExpr(swizzling string) Expr {
return Expr{ return Expr{
Type: SwizzlingExpr, Type: SwizzlingExpr,
Swizzling: swizzling, Ident: swizzling,
} }
} }

1
internal/shaderir/program.go
View File

@ -89,7 +89,6 @@ type Expr struct {
Int int32 Int int32
Float float32 Float float32
BuiltinFunc BuiltinFunc BuiltinFunc BuiltinFunc
Swizzling string
Ident string Ident string
Op Op Op Op
} }