aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2020-01-10 22:58:49 +1100
committerMarge Bot <[email protected]>2020-01-23 01:02:25 +0000
commit55e4410b34bb699cd3dbfc32f272b3c721e00760 (patch)
tree73103bf28b1db8e5d8c752d9dff90d9aeb3ba7ea
parentb065d8fb8cf55373bfdd80994417f1ac60976158 (diff)
glsl: remove bogus assert in nir uniform linking
I'm not sure why this was first added but it causes an assert on any uniform matrix. Reviewed-by: Alejandro PiƱeiro <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3468>
-rw-r--r--src/compiler/glsl/gl_nir_link_uniforms.c1
1 files changed, 0 insertions, 1 deletions
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);