Common subdirectories: mesa-stock/src/glsl/builtin_compiler and mesa/src/glsl/builtin_compiler
Common subdirectories: mesa-stock/src/glsl/builtins and mesa/src/glsl/builtins
Common subdirectories: mesa-stock/src/glsl/glcpp and mesa/src/glsl/glcpp
diff mesa-stock/src/glsl/ir_function.cpp mesa/src/glsl/ir_function.cpp
82c82
< 	 if (!actual->type->can_implicitly_convert_to(param->type))
---
> 	 if (!actual->type || !actual->type->can_implicitly_convert_to(param->type))
87c87
< 	 if (!param->type->can_implicitly_convert_to(actual->type))
---
> 	 if (!param->type || !param->type->can_implicitly_convert_to(actual->type))
diff mesa-stock/src/glsl/ir_validate.cpp mesa/src/glsl/ir_validate.cpp
81a82,87
> void handle_validation_failure()
> {
> #if _DEBUG
>    abort();
> #endif
> }
89c95
<       abort();
---
>       handle_validation_failure();
96c102
<       abort();
---
>       handle_validation_failure();
112c118
<       abort();
---
>       handle_validation_failure();
131c137
< 	 abort();
---
> 	 handle_validation_failure();
136c142
< 	 abort();
---
> 	 handle_validation_failure();
147c153
< 	 abort();
---
> 	 handle_validation_failure();
166c172
<       abort();
---
>       handle_validation_failure();
186c192
< 	 abort();
---
> 	 handle_validation_failure();
212c218
<       abort();
---
>       handle_validation_failure();
218c224
<       abort();
---
>       handle_validation_failure();
536c542
< 	 abort();
---
> 	 handle_validation_failure();
566c572
< 	 abort();
---
> 	 handle_validation_failure();
574c580
<       abort();
---
>       handle_validation_failure();
589c595
< 	 abort();
---
> 	 handle_validation_failure();
603c609
< 	 abort();
---
> 	 handle_validation_failure();
619c625
<       abort();
---
>       handle_validation_failure();
626c632
< 	 abort();
---
> 	 handle_validation_failure();
630c636
<       abort();
---
>       handle_validation_failure();
669c675
<    abort();
---
>    handle_validation_failure();
682c688
<       abort();
---
>       handle_validation_failure();
diff mesa-stock/src/glsl/lower_mat_op_to_vec.cpp mesa/src/glsl/lower_mat_op_to_vec.cpp
421a422
> #if _DEBUG
422a424
> #endif
Common subdirectories: mesa-stock/src/glsl/tests and mesa/src/glsl/tests