freedreno: update generated headers

Pull in RB_BLEND_* fixes.

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h b/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
index 606252e6726951f158c4432061d444dc31d6f2ef..c4b58b1d4280042220203b229e1fd5935efc65ce 100644 (file)
--- a/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
+++ b/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
@@ -14,7 +14,7 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16185 bytes, from 2016-03-05 03:08:05)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110342 bytes, from 2016-03-07 11:20:29)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110558 bytes, from 2016-04-22 18:36:21)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)
 
 Copyright (C) 2013-2015 by the following authors:

diff --git a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
index 3838fdf44d096805663d69118b4f3c426991f9c4..3be22fe203a7258190fc654945441fcbcfee5ae6 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
+++ b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
@@ -14,7 +14,7 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16185 bytes, from 2016-03-05 03:08:05)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110342 bytes, from 2016-03-07 11:20:29)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110558 bytes, from 2016-04-22 18:36:21)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)
 
 Copyright (C) 2013-2016 by the following authors:

diff --git a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
index 98750123291eae7de3c02810b60492d7761b468e..e8dd41375f6defa3f8ee61f4b4170b8c0b4d5197 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
+++ b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
@@ -14,7 +14,7 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16185 bytes, from 2016-03-05 03:08:05)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110342 bytes, from 2016-03-07 11:20:29)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110558 bytes, from 2016-04-22 18:36:21)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)
 
 Copyright (C) 2013-2016 by the following authors:
@@ -1074,12 +1074,18 @@ static inline uint32_t A4XX_RB_MRT_BLEND_CONTROL_ALPHA_DEST_FACTOR(enum adreno_r
 }
 
 #define REG_A4XX_RB_BLEND_RED                                  0x000020f0
-#define A4XX_RB_BLEND_RED_UINT__MASK                           0x0000ffff
+#define A4XX_RB_BLEND_RED_UINT__MASK                           0x000000ff
 #define A4XX_RB_BLEND_RED_UINT__SHIFT                          0
 static inline uint32_t A4XX_RB_BLEND_RED_UINT(uint32_t val)
 {
        return ((val) << A4XX_RB_BLEND_RED_UINT__SHIFT) & A4XX_RB_BLEND_RED_UINT__MASK;
 }
+#define A4XX_RB_BLEND_RED_SINT__MASK                           0x0000ff00
+#define A4XX_RB_BLEND_RED_SINT__SHIFT                          8
+static inline uint32_t A4XX_RB_BLEND_RED_SINT(uint32_t val)
+{
+       return ((val) << A4XX_RB_BLEND_RED_SINT__SHIFT) & A4XX_RB_BLEND_RED_SINT__MASK;
+}
 #define A4XX_RB_BLEND_RED_FLOAT__MASK                          0xffff0000
 #define A4XX_RB_BLEND_RED_FLOAT__SHIFT                         16
 static inline uint32_t A4XX_RB_BLEND_RED_FLOAT(float val)
@@ -1096,12 +1102,18 @@ static inline uint32_t A4XX_RB_BLEND_RED_F32(float val)
 }
 
 #define REG_A4XX_RB_BLEND_GREEN                                        0x000020f2
-#define A4XX_RB_BLEND_GREEN_UINT__MASK                         0x0000ffff
+#define A4XX_RB_BLEND_GREEN_UINT__MASK                         0x000000ff
 #define A4XX_RB_BLEND_GREEN_UINT__SHIFT                                0
 static inline uint32_t A4XX_RB_BLEND_GREEN_UINT(uint32_t val)
 {
        return ((val) << A4XX_RB_BLEND_GREEN_UINT__SHIFT) & A4XX_RB_BLEND_GREEN_UINT__MASK;
 }
+#define A4XX_RB_BLEND_GREEN_SINT__MASK                         0x0000ff00
+#define A4XX_RB_BLEND_GREEN_SINT__SHIFT                                8
+static inline uint32_t A4XX_RB_BLEND_GREEN_SINT(uint32_t val)
+{
+       return ((val) << A4XX_RB_BLEND_GREEN_SINT__SHIFT) & A4XX_RB_BLEND_GREEN_SINT__MASK;
+}
 #define A4XX_RB_BLEND_GREEN_FLOAT__MASK                                0xffff0000
 #define A4XX_RB_BLEND_GREEN_FLOAT__SHIFT                       16
 static inline uint32_t A4XX_RB_BLEND_GREEN_FLOAT(float val)
@@ -1118,12 +1130,18 @@ static inline uint32_t A4XX_RB_BLEND_GREEN_F32(float val)
 }
 
 #define REG_A4XX_RB_BLEND_BLUE                                 0x000020f4
-#define A4XX_RB_BLEND_BLUE_UINT__MASK                          0x0000ffff
+#define A4XX_RB_BLEND_BLUE_UINT__MASK                          0x000000ff
 #define A4XX_RB_BLEND_BLUE_UINT__SHIFT                         0
 static inline uint32_t A4XX_RB_BLEND_BLUE_UINT(uint32_t val)
 {
        return ((val) << A4XX_RB_BLEND_BLUE_UINT__SHIFT) & A4XX_RB_BLEND_BLUE_UINT__MASK;
 }
+#define A4XX_RB_BLEND_BLUE_SINT__MASK                          0x0000ff00
+#define A4XX_RB_BLEND_BLUE_SINT__SHIFT                         8
+static inline uint32_t A4XX_RB_BLEND_BLUE_SINT(uint32_t val)
+{
+       return ((val) << A4XX_RB_BLEND_BLUE_SINT__SHIFT) & A4XX_RB_BLEND_BLUE_SINT__MASK;
+}
 #define A4XX_RB_BLEND_BLUE_FLOAT__MASK                         0xffff0000
 #define A4XX_RB_BLEND_BLUE_FLOAT__SHIFT                                16
 static inline uint32_t A4XX_RB_BLEND_BLUE_FLOAT(float val)
@@ -1140,12 +1158,18 @@ static inline uint32_t A4XX_RB_BLEND_BLUE_F32(float val)
 }
 
 #define REG_A4XX_RB_BLEND_ALPHA                                        0x000020f6
-#define A4XX_RB_BLEND_ALPHA_UINT__MASK                         0x0000ffff
+#define A4XX_RB_BLEND_ALPHA_UINT__MASK                         0x000000ff
 #define A4XX_RB_BLEND_ALPHA_UINT__SHIFT                                0
 static inline uint32_t A4XX_RB_BLEND_ALPHA_UINT(uint32_t val)
 {
        return ((val) << A4XX_RB_BLEND_ALPHA_UINT__SHIFT) & A4XX_RB_BLEND_ALPHA_UINT__MASK;
 }
+#define A4XX_RB_BLEND_ALPHA_SINT__MASK                         0x0000ff00
+#define A4XX_RB_BLEND_ALPHA_SINT__SHIFT                                8
+static inline uint32_t A4XX_RB_BLEND_ALPHA_SINT(uint32_t val)
+{
+       return ((val) << A4XX_RB_BLEND_ALPHA_SINT__SHIFT) & A4XX_RB_BLEND_ALPHA_SINT__MASK;
+}
 #define A4XX_RB_BLEND_ALPHA_FLOAT__MASK                                0xffff0000
 #define A4XX_RB_BLEND_ALPHA_FLOAT__SHIFT                       16
 static inline uint32_t A4XX_RB_BLEND_ALPHA_FLOAT(float val)

diff --git a/src/gallium/drivers/freedreno/adreno_common.xml.h b/src/gallium/drivers/freedreno/adreno_common.xml.h
index 4e361b0a24625f896d50d2b9afcd55f768a58f3e..ef206dc62ef17144700b41ac09b000118849ac1c 100644 (file)
--- a/src/gallium/drivers/freedreno/adreno_common.xml.h
+++ b/src/gallium/drivers/freedreno/adreno_common.xml.h
@@ -14,7 +14,7 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16185 bytes, from 2016-03-05 03:08:05)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110342 bytes, from 2016-03-07 11:20:29)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110558 bytes, from 2016-04-22 18:36:21)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)
 
 Copyright (C) 2013-2016 by the following authors:

diff --git a/src/gallium/drivers/freedreno/adreno_pm4.xml.h b/src/gallium/drivers/freedreno/adreno_pm4.xml.h
index 932cfc0d5e83fba87b7098699687d167052ba64c..9d8fcb4e7bb025996e8c4e758748c1317ffc9027 100644 (file)
--- a/src/gallium/drivers/freedreno/adreno_pm4.xml.h
+++ b/src/gallium/drivers/freedreno/adreno_pm4.xml.h
@@ -14,7 +14,7 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (  11518 bytes, from 2016-02-10 21:03:25)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  16185 bytes, from 2016-03-05 03:08:05)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  83967 bytes, from 2016-02-10 17:07:21)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110342 bytes, from 2016-03-07 11:20:29)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          ( 110558 bytes, from 2016-04-22 18:36:21)
 - /home/robclark/src/freedreno/envytools/rnndb/adreno/ocmem.xml         (   1773 bytes, from 2015-09-24 17:30:00)
 
 Copyright (C) 2013-2016 by the following authors: