From 55e4410b34bb699cd3dbfc32f272b3c721e00760 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Fri, 10 Jan 2020 22:58:49 +1100
Subject: [PATCH] glsl: remove bogus assert in nir uniform linking
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

I'm not sure why this was first added but it causes an assert
on any uniform matrix.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3468>
---
 src/compiler/glsl/gl_nir_link_uniforms.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index 4ecd34da2b2..efb26caf7ff 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -555,7 +555,6 @@ nir_link_uniform(struct gl_context *ctx,
             glsl_get_explicit_stride(type) : 0;
 
          if (glsl_type_is_matrix(type)) {
-            assert(parent_type);
             uniform->matrix_stride = glsl_get_explicit_stride(type);
 
             uniform->row_major = glsl_matrix_type_is_row_major(type);
-- 
2.30.2