commit 42f97f8ce3a9c119ccf960c5cad399f18114e924
author Boris Brezillon <boris.brezillon@collabora.com> Tue Jun 30 12:03:00 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Thu Sep 03 18:02:50 2020 +0000
tree 0bc0dcccf09073ae3c6c39886b80684cd3bd11c3
parent be68de81abb3cf2d6944c4c5273c453a61437208

nir/glsl: Consider block interfaces as structs when it comes to size/align calculation

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6472>

src/compiler/nir_types.cpp

diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index f86f0a7..c7d0741 100644
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -696,6 +696,7 @@
       break;
    }
 
+   case GLSL_TYPE_INTERFACE:
    case GLSL_TYPE_STRUCT:
       *size = 0;
       *align = 0;
@@ -719,7 +720,6 @@
    case GLSL_TYPE_SUBROUTINE:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
-   case GLSL_TYPE_INTERFACE:
    case GLSL_TYPE_FUNCTION:
       unreachable("type does not have a natural size");
    }