Mesa (master): nir: Constant values are per-column not per-component

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Mar 20 14:27:18 UTC 2019


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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Mar 19 14:14:02 2019 -0500

nir: Constant values are per-column not per-component

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Karol Herbst <kherbst at redhat.com>

---

 src/compiler/nir/nir.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 067287fab1c..f9c2adb83e5 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -59,6 +59,7 @@ extern "C" {
 #define NIR_FALSE 0u
 #define NIR_TRUE (~0u)
 #define NIR_MAX_VEC_COMPONENTS 4
+#define NIR_MAX_MATRIX_COLUMNS 4
 typedef uint8_t nir_component_mask_t;
 
 /** Defines a cast function
@@ -141,7 +142,7 @@ typedef struct nir_constant {
     * by the type associated with the \c nir_variable.  Constants may be
     * scalars, vectors, or matrices.
     */
-   nir_const_value values[NIR_MAX_VEC_COMPONENTS];
+   nir_const_value values[NIR_MAX_MATRIX_COLUMNS];
 
    /* we could get this from the var->type but makes clone *much* easier to
     * not have to care about the type.




More information about the mesa-commit mailing list