Module: Mesa
Branch: master
Commit: ff81c3c9fd14c994fca4a0b4f98f5befc99a1936
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff81c3c9fd14c994fca4a0b4f98f5befc99a1936
Author: Rob Clark <robdcl...@gmail.com>
Date: Mon Jan 2 12:18:59 2017 -0500
freedreno: update generated headers
Signed-off-by: Rob Clark <robdcl...@gmail.com>
---
src/gallium/drivers/freedreno/a2xx/a2xx.xml.h | 2 +-
src/gallium/drivers/freedreno/a3xx/a3xx.xml.h | 2 +-
src/gallium/drivers/freedreno/a4xx/a4xx.xml.h | 2 +-
src/gallium/drivers/freedreno/a5xx/a5xx.xml.h | 25 +++++++++++++++--------
src/gallium/drivers/freedreno/adreno_common.xml.h | 2 +-
src/gallium/drivers/freedreno/adreno_pm4.xml.h | 2 +-
6 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
b/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
index ca81ae8..8e7e021 100644
--- a/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
+++ b/src/gallium/drivers/freedreno/a2xx/a2xx.xml.h
@@ -15,7 +15,7 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml (
23277 bytes, from 2016-12-24 05:01:47)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml (
83840 bytes, from 2016-11-26 23:01:08)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml (
110757 bytes, from 2016-12-26 17:51:07)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99224 bytes, from 2016-12-26 18:40:41)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99436 bytes, from 2017-01-10 16:36:25)
- /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/a3xx/a3xx.xml.h
b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
index 5e593f1..32cd34a 100644
--- a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
+++ b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
@@ -15,7 +15,7 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml (
23277 bytes, from 2016-12-24 05:01:47)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml (
83840 bytes, from 2016-11-26 23:01:08)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml (
110757 bytes, from 2016-12-26 17:51:07)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99224 bytes, from 2016-12-26 18:40:41)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99436 bytes, from 2017-01-10 16:36:25)
- /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 439bf81..2dfdc28 100644
--- a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
+++ b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
@@ -15,7 +15,7 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml (
23277 bytes, from 2016-12-24 05:01:47)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml (
83840 bytes, from 2016-11-26 23:01:08)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml (
110757 bytes, from 2016-12-26 17:51:07)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99224 bytes, from 2016-12-26 18:40:41)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99436 bytes, from 2017-01-10 16:36:25)
- /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/a5xx/a5xx.xml.h
b/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
index 58dc385..badf3eb 100644
--- a/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
+++ b/src/gallium/drivers/freedreno/a5xx/a5xx.xml.h
@@ -15,10 +15,10 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml (
23277 bytes, from 2016-12-24 05:01:47)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml (
83840 bytes, from 2016-11-26 23:01:08)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml (
110757 bytes, from 2016-12-26 17:51:07)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99224 bytes, from 2016-12-26 18:40:41)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99436 bytes, from 2017-01-10 16:36:25)
- /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:
+Copyright (C) 2013-2017 by the following authors:
- Rob Clark <robdcl...@gmail.com> (robclark)
- Ilia Mirkin <imir...@alum.mit.edu> (imirkin)
@@ -2064,6 +2064,7 @@ static inline uint32_t A5XX_GRAS_SU_POINT_SIZE(float val)
#define REG_A5XX_GRAS_SU_DEPTH_PLANE_CNTL 0x0000e094
#define A5XX_GRAS_SU_DEPTH_PLANE_CNTL_FRAG_WRITES_Z 0x00000001
+#define A5XX_GRAS_SU_DEPTH_PLANE_CNTL_UNK1 0x00000002
#define REG_A5XX_GRAS_SU_POLY_OFFSET_SCALE 0x0000e095
#define A5XX_GRAS_SU_POLY_OFFSET_SCALE__MASK 0xffffffff
@@ -2583,6 +2584,7 @@ static inline uint32_t
A5XX_RB_BLEND_CNTL_SAMPLE_MASK(uint32_t val)
#define REG_A5XX_RB_DEPTH_PLANE_CNTL 0x0000e1b0
#define A5XX_RB_DEPTH_PLANE_CNTL_FRAG_WRITES_Z 0x00000001
+#define A5XX_RB_DEPTH_PLANE_CNTL_UNK1 0x00000002
#define REG_A5XX_RB_DEPTH_CNTL 0x0000e1b1
#define A5XX_RB_DEPTH_CNTL_Z_ENABLE 0x00000001
@@ -3003,18 +3005,18 @@ static inline uint32_t
A5XX_VFD_CONTROL_0_VTXCNT(uint32_t val)
}
#define REG_A5XX_VFD_CONTROL_1 0x0000e401
+#define A5XX_VFD_CONTROL_1_REGID4VTX__MASK 0x000000ff
+#define A5XX_VFD_CONTROL_1_REGID4VTX__SHIFT 0
+static inline uint32_t A5XX_VFD_CONTROL_1_REGID4VTX(uint32_t val)
+{
+ return ((val) << A5XX_VFD_CONTROL_1_REGID4VTX__SHIFT) &
A5XX_VFD_CONTROL_1_REGID4VTX__MASK;
+}
#define A5XX_VFD_CONTROL_1_REGID4INST__MASK 0x0000ff00
#define A5XX_VFD_CONTROL_1_REGID4INST__SHIFT 8
static inline uint32_t A5XX_VFD_CONTROL_1_REGID4INST(uint32_t val)
{
return ((val) << A5XX_VFD_CONTROL_1_REGID4INST__SHIFT) &
A5XX_VFD_CONTROL_1_REGID4INST__MASK;
}
-#define A5XX_VFD_CONTROL_1_REGID4VTX__MASK 0x00ff0000
-#define A5XX_VFD_CONTROL_1_REGID4VTX__SHIFT 16
-static inline uint32_t A5XX_VFD_CONTROL_1_REGID4VTX(uint32_t val)
-{
- return ((val) << A5XX_VFD_CONTROL_1_REGID4VTX__SHIFT) &
A5XX_VFD_CONTROL_1_REGID4VTX__MASK;
-}
#define REG_A5XX_VFD_CONTROL_2 0x0000e402
@@ -3059,6 +3061,7 @@ static inline uint32_t A5XX_VFD_DECODE_INSTR_SWAP(enum
a3xx_color_swap val)
{
return ((val) << A5XX_VFD_DECODE_INSTR_SWAP__SHIFT) &
A5XX_VFD_DECODE_INSTR_SWAP__MASK;
}
+#define A5XX_VFD_DECODE_INSTR_INSTANCED
0x00020000
static inline uint32_t REG_A5XX_VFD_DECODE_STEP_RATE(uint32_t i0) { return
0x0000e48b + 0x2*i0; }
@@ -3832,6 +3835,12 @@ static inline uint32_t A5XX_TEX_CONST_0_SWIZ_W(enum
a5xx_tex_swiz val)
{
return ((val) << A5XX_TEX_CONST_0_SWIZ_W__SHIFT) &
A5XX_TEX_CONST_0_SWIZ_W__MASK;
}
+#define A5XX_TEX_CONST_0_MIPLVLS__MASK 0x000f0000
+#define A5XX_TEX_CONST_0_MIPLVLS__SHIFT 16
+static inline uint32_t A5XX_TEX_CONST_0_MIPLVLS(uint32_t val)
+{
+ return ((val) << A5XX_TEX_CONST_0_MIPLVLS__SHIFT) &
A5XX_TEX_CONST_0_MIPLVLS__MASK;
+}
#define A5XX_TEX_CONST_0_FMT__MASK 0x3fc00000
#define A5XX_TEX_CONST_0_FMT__SHIFT 22
static inline uint32_t A5XX_TEX_CONST_0_FMT(enum a5xx_tex_fmt val)
diff --git a/src/gallium/drivers/freedreno/adreno_common.xml.h
b/src/gallium/drivers/freedreno/adreno_common.xml.h
index fc75e44..dda980c 100644
--- a/src/gallium/drivers/freedreno/adreno_common.xml.h
+++ b/src/gallium/drivers/freedreno/adreno_common.xml.h
@@ -15,7 +15,7 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml (
23277 bytes, from 2016-12-24 05:01:47)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml (
83840 bytes, from 2016-11-26 23:01:08)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml (
110757 bytes, from 2016-12-26 17:51:07)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99224 bytes, from 2016-12-26 18:40:41)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99436 bytes, from 2017-01-10 16:36:25)
- /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 be9486d..a1e1158 100644
--- a/src/gallium/drivers/freedreno/adreno_pm4.xml.h
+++ b/src/gallium/drivers/freedreno/adreno_pm4.xml.h
@@ -15,7 +15,7 @@ The rules-ng-ng source files this header was generated from
are:
- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml (
23277 bytes, from 2016-12-24 05:01:47)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml (
83840 bytes, from 2016-11-26 23:01:08)
- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml (
110757 bytes, from 2016-12-26 17:51:07)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99224 bytes, from 2016-12-26 18:40:41)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a5xx.xml (
99436 bytes, from 2017-01-10 16:36:25)
- /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:
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
