Mesa (main): nir/types: fix glsl_matrix_type_is_row_major() assert

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0e7863c3b025042d7e41b5c9f73a6b7f788a87a3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e7863c3b025042d7e41b5c9f73a6b7f788a87a3

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Jun 24 11:15:50 2022 -0400

nir/types: fix glsl_matrix_type_is_row_major() assert

interface blocks can have row_major set

cc: mesa-stable

affects (zink):
dEQP-GLES2.functional.shaders*

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17238>

---

 src/compiler/nir_types.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index 4693ddd4905..1f86a386933 100644
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -319,7 +319,7 @@ glsl_type_is_matrix(const struct glsl_type *type)
 bool
 glsl_matrix_type_is_row_major(const struct glsl_type *type)
 {
-   assert(type->is_matrix() && type->explicit_stride);
+   assert((type->is_matrix() && type->explicit_stride) || type->is_interface());
    return type->interface_row_major;
 }