Module: Mesa Branch: master Commit: 55e4410b34bb699cd3dbfc32f272b3c721e00760 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=55e4410b34bb699cd3dbfc32f272b3c721e00760
Author: Timothy Arceri <[email protected]> Date: Fri Jan 10 22:58:49 2020 +1100 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> --- 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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
