projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b065d8f
)
glsl: remove bogus assert in nir uniform linking
author
Timothy Arceri
<tarceri@itsqueeze.com>
Fri, 10 Jan 2020 11:58:49 +0000
(22:58 +1100)
committer
Marge Bot
<eric+marge@anholt.net>
Thu, 23 Jan 2020 01:02:25 +0000
(
01:02
+0000)
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
patch
|
blob
|
history
diff --git
a/src/compiler/glsl/gl_nir_link_uniforms.c
b/src/compiler/glsl/gl_nir_link_uniforms.c
index 4ecd34da2b200c0b8a5c0897730cda2e652aa6f8..efb26caf7ff73fef4e52f6dbb6b5395e9ca863b9 100644
(file)
--- 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);