diff --git a/internal/shader/block.go b/internal/shader/block.go
index aecdf03dd..539d3aca7 100644
--- a/internal/shader/block.go
+++ b/internal/shader/block.go
@@ -125,12 +125,11 @@ func dumpExpr(e ast.Expr) string {
 	case *ast.BasicLit:
 		return e.Value
 	case *ast.CompositeLit:
-		t := parseType(e.Type)
 		var vals []string
 		for _, e := range e.Elts {
 			vals = append(vals, dumpExpr(e))
 		}
-		return fmt.Sprintf("%s{%s}", t, strings.Join(vals, ", "))
+		return fmt.Sprintf("%s{%s}", e.Type, strings.Join(vals, ", "))
 	case *ast.Ident:
 		return e.Name
 	case *ast.SelectorExpr:
diff --git a/internal/shader/shader.go b/internal/shader/shader.go
index 36dc7d66f..e4cd91184 100644
--- a/internal/shader/shader.go
+++ b/internal/shader/shader.go
@@ -192,11 +192,7 @@ func (sh *Shader) parseStruct(t *ast.TypeSpec) {
 				sh.addError(f.Pos(), fmt.Sprintf("position members must be one"))
 				continue
 			}
-			t := parseType(f.Type)
-			if t == basicTypeNone {
-				sh.addError(f.Type.Pos(), fmt.Sprintf("unexpected type: %s", f.Type))
-				continue
-			}
+			t := sh.parseType(f.Type)
 			if t != basicTypeVec4 {
 				sh.addError(f.Type.Pos(), fmt.Sprintf("position must be vec4 but %s", t))
 				continue
@@ -207,11 +203,7 @@ func (sh *Shader) parseStruct(t *ast.TypeSpec) {
 			}
 			continue
 		}
-		t := parseType(f.Type)
-		if t == basicTypeNone {
-			sh.addError(f.Type.Pos(), fmt.Sprintf("unexpected type: %s", f.Type))
-			continue
-		}
+		t := sh.parseType(f.Type)
 		if !t.numeric() {
 			sh.addError(f.Type.Pos(), fmt.Sprintf("members in %s must be numeric but %s", varyingStructName, t))
 			continue
@@ -228,11 +220,7 @@ func (sh *Shader) parseStruct(t *ast.TypeSpec) {
 func (s *Shader) parseVariable(block *block, vs *ast.ValueSpec) []variable {
 	var t basicType
 	if vs.Type != nil {
-		t = parseType(vs.Type)
-		if t == basicTypeNone {
-			s.addError(vs.Type.Pos(), fmt.Sprintf("unexpected type: %s", vs.Type))
-			return nil
-		}
+		t = s.parseType(vs.Type)
 	}
 
 	var vars []variable
@@ -257,11 +245,7 @@ func (s *Shader) parseVariable(block *block, vs *ast.ValueSpec) []variable {
 func (s *Shader) parseConstant(vs *ast.ValueSpec) []constant {
 	var t basicType
 	if vs.Type != nil {
-		t = parseType(vs.Type)
-		if t == basicTypeNone {
-			s.addError(vs.Type.Pos(), fmt.Sprintf("unexpected type: %s", vs.Type))
-			return nil
-		}
+		t = s.parseType(vs.Type)
 	}
 
 	var cs []constant
@@ -287,11 +271,7 @@ func (sh *Shader) parseFunc(d *ast.FuncDecl, block *block) function {
 
 	var args []variable
 	for _, f := range d.Type.Params.List {
-		t := parseType(f.Type)
-		if t == basicTypeNone {
-			sh.addError(f.Type.Pos(), fmt.Sprintf("unexpected type: %s", f.Type))
-			continue
-		}
+		t := sh.parseType(f.Type)
 		for _, n := range f.Names {
 			args = append(args, variable{
 				name:      n.Name,
@@ -303,11 +283,7 @@ func (sh *Shader) parseFunc(d *ast.FuncDecl, block *block) function {
 	var rets []variable
 	if d.Type.Results != nil {
 		for _, f := range d.Type.Results.List {
-			t := parseType(f.Type)
-			if t == basicTypeNone {
-				sh.addError(f.Type.Pos(), fmt.Sprintf("unexpected type: %s", f.Type))
-				continue
-			}
+			t := sh.parseType(f.Type)
 			if len(f.Names) == 0 {
 				rets = append(rets, variable{
 					name:      "",
@@ -408,7 +384,7 @@ func (s *Shader) detectType(b *block, expr ast.Expr) basicType {
 		}
 		return basicTypeNone
 	case *ast.CompositeLit:
-		return parseType(e.Type)
+		return s.parseType(e.Type)
 	case *ast.Ident:
 		n := e.Name
 		for _, v := range b.vars {
diff --git a/internal/shader/type.go b/internal/shader/type.go
index 1b4430734..86fc158a9 100644
--- a/internal/shader/type.go
+++ b/internal/shader/type.go
@@ -35,7 +35,7 @@ const (
 	basicTypeSampler2d
 )
 
-func parseType(expr ast.Expr) basicType {
+func (s *Shader) parseType(expr ast.Expr) basicType {
 	switch t := expr.(type) {
 	case *ast.Ident:
 		switch t.Name {
@@ -55,8 +55,9 @@ func parseType(expr ast.Expr) basicType {
 			return basicTypeMat4
 		case "sampler2d":
 			return basicTypeSampler2d
+		default:
+			s.addError(t.Pos(), fmt.Sprintf("unexpected type: %s", t.Name))
 		}
-		// TODO: Parse array types
 	}
 	return basicTypeNone
 }