Mesa (master): nir: Use a single bit for the dual-source blend index

Timothy Arceri tarceri at kemper.freedesktop.org
Mon Aug 3 11:37:01 UTC 2015


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

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Sun Aug  2 14:57:38 2015 +1000

nir: Use a single bit for the dual-source blend index

The only values allowed are 0 and 1, and the value is checked before
assigning.

This is a copy of 8eeca7a56c that seems to have been made to the glsl
ir type after it was copied for use in nir but before nir landed.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/glsl/nir/nir.h |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index 62cdbd4..6c954c0 100644
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -292,9 +292,13 @@ typedef struct {
       unsigned int driver_location;
 
       /**
-       * output index for dual source blending.
+       * Output index for dual source blending.
+       *
+       * \note
+       * The GLSL spec only allows the values 0 or 1 for the index in \b dual
+       * source blending.
        */
-      int index;
+      unsigned index:1;
 
       /**
        * Initial binding point for a sampler or UBO.




More information about the mesa-commit mailing list