fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-25 19:08:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/types: fix glsl_matrix_type_is_row_major() assert

Browse source 
interface blocks can have row_major set

cc: mesa-stable

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

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

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17238>
(cherry picked from commit 0e7863c3b0)
This commit is contained in:
Mike Blumenkrantz 2022-06-24 11:15:50 -04:00 • committed by Dylan Baker
parent 7d4d33e858
commit a066287f1b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -58,7 +58,7 @@
"description": "nir/types: fix glsl_matrix_type_is_row_major() assert",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

2
src/compiler/nir_types.cpp
View file

@ -313,7 +313,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;
}