Mesa (master): nir: add matrix_layout to nir_variable data

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Apr 18 12:15:31 UTC 2020


Module: Mesa
Branch: master
Commit: c19ebca308f30d09949ca66cc10ea63592fe98cf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c19ebca308f30d09949ca66cc10ea63592fe98cf

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Mar 13 14:18:27 2020 +1100

nir: add matrix_layout to nir_variable data

This will be used by the following patch.

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4623>

---

 src/compiler/glsl/glsl_to_nir.cpp | 1 +
 src/compiler/nir/nir.h            | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index 2043ea8d8ba..8ef74066925 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -464,6 +464,7 @@ nir_visitor::visit(ir_variable *ir)
 
    var->data.precision = ir->data.precision;
    var->data.explicit_location = ir->data.explicit_location;
+   var->data.matrix_layout = ir->data.matrix_layout;
    var->data.from_named_ifc_block = ir->data.from_named_ifc_block;
    var->data.compact = false;
 
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index c76d009bf8c..b9a5637e68e 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -439,6 +439,11 @@ typedef struct nir_variable {
        */
       unsigned explicit_offset:1;
 
+      /**
+       * Layout of the matrix.  Uses glsl_matrix_layout values.
+       */
+      unsigned matrix_layout:2;
+
       /**
        * Non-zero if this variable was created by lowering a named interface
        * block.



More information about the mesa-commit mailing list