From 73986a7a262807ab2cfd6d46ae17cfc7a30cdfec Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 20 Apr 2010 16:49:03 -0700
Subject: [PATCH] Ensure that structure fields have non-NULL types

---
 ast_to_hir.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index a29a49d98dd..9b39d1f05b9 100644
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -2320,7 +2320,8 @@ ast_struct_specifier::hir(exec_list *instructions,
 	    ? process_array_type(decl_type, decl->array_size, state)
 	    : decl_type;
 
-	 fields[i].type = field_type;
+	 fields[i].type = (field_type != NULL)
+	    ? field_type : glsl_type::error_type;
 	 fields[i].name = decl->identifier;
 	 i++;
       }
-- 
2.30.2