From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Wed, 26 Apr 2017 03:56:44 +0000 (+1000)
Subject: glsl: use without_array() rather than get_scalar_type()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=52c76dbad39a96995624796b8363fed0ac065a18;p=mesa.git

glsl: use without_array() rather than get_scalar_type()

Here get_scalar_type() was just being use to remove the array
after that we converted it back to base_type anyway so just
use the without_array() helper.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
---

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index aeb223db9e7..0ae87cb93ea 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -3858,7 +3858,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
        * 3.00 spec allows structs as well.  Varying structs are also allowed
        * in GLSL 1.50.
        */
-      switch (var->type->get_scalar_type()->base_type) {
+      switch (var->type->without_array()->base_type) {
       case GLSL_TYPE_FLOAT:
          /* Ok in all GLSL versions */
          break;