shaderir: Refactoring

internal/shaderir/glsl.go

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

internal/shaderir/ir_test.go

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

internal/shaderir/program.go

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