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

Eric Anholt anholt at kemper.freedesktop.org
Wed Aug 5 03:10:45 UTC 2015


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug  4 17:18:43 2015 -0700

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

This reverts commit ab5b7a0fe659ff6f9c1885d5cb047b6531959506.  We use more
than one bit of value in tgsi_to_nir.

---

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

diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index d9daaa2..0603b3e 100644
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -292,13 +292,9 @@ typedef struct {
       unsigned int driver_location;
 
       /**
-       * 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.
+       * output index for dual source blending.
        */
-      unsigned index:1;
+      int index;
 
       /**
        * Initial binding point for a sampler or UBO.




More information about the mesa-commit mailing list