From 8a6140a92fc0b773afc0f2d7490205ade156f9b8 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sun, 17 May 2020 02:45:03 +0900
Subject: [PATCH] shaderir: Refactoring

---
 internal/shaderir/glsl.go    | 6 +++---
 internal/shaderir/ir_test.go | 4 ++--
 internal/shaderir/program.go | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/internal/shaderir/glsl.go b/internal/shaderir/glsl.go
index 0906523e8..b00373182 100644
--- a/internal/shaderir/glsl.go
+++ b/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:
diff --git a/internal/shaderir/ir_test.go b/internal/shaderir/ir_test.go
index ebba64f28..c14ca9886 100644
--- a/internal/shaderir/ir_test.go
+++ b/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,
 	}
 }
 
diff --git a/internal/shaderir/program.go b/internal/shaderir/program.go
index 50d934271..6ff7b161a 100644
--- a/internal/shaderir/program.go
+++ b/internal/shaderir/program.go
@@ -89,7 +89,6 @@ type Expr struct {
 	Int         int32
 	Float       float32
 	BuiltinFunc BuiltinFunc
-	Swizzling   string
 	Ident       string
 	Op          Op
 }