summaryrefslogtreecommitdiff
path: root/nouveau
diff options
context:
space:
mode:
authorPatrice Mandin <patmandin@gmail.com>2010-02-20 11:57:29 +0100
committerPatrice Mandin <patmandin@gmail.com>2010-02-20 11:57:29 +0100
commit3130f94c6ee32668cb9f0b96b6c8e308a7bb3b11 (patch)
tree4ea44e223d8bf4d45f568e53ed61fc91b02a9bc9 /nouveau
parentbdcd12980b5560b32a006534a7451ed6e3502c33 (diff)
nv30: update for 8 texture units
Diffstat (limited to 'nouveau')
-rw-r--r--nouveau/nouveau_class.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/nouveau/nouveau_class.h b/nouveau/nouveau_class.h
index 9696b356..fc71ca8b 100644
--- a/nouveau/nouveau_class.h
+++ b/nouveau/nouveau_class.h
@@ -6319,7 +6319,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NV34TCL_POLYGON_SMOOTH_ENABLE 0x00001838
#define NV34TCL_CULL_FACE_ENABLE 0x0000183c
#define NV34TCL_TX_PALETTE_OFFSET(x) (0x00001840+((x)*4))
-#define NV34TCL_TX_PALETTE_OFFSET__SIZE 0x00000004
+#define NV34TCL_TX_PALETTE_OFFSET__SIZE 0x00000008
#define NV34TCL_VTX_ATTR_2F_X(x) (0x00001880+((x)*8))
#define NV34TCL_VTX_ATTR_2F_X__SIZE 0x00000010
#define NV34TCL_VTX_ATTR_2F_Y(x) (0x00001884+((x)*8))
@@ -6353,9 +6353,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NV34TCL_VTX_ATTR_4I_ZW_W_SHIFT 16
#define NV34TCL_VTX_ATTR_4I_ZW_W_MASK 0xffff0000
#define NV34TCL_TX_OFFSET(x) (0x00001a00+((x)*32))
-#define NV34TCL_TX_OFFSET__SIZE 0x00000004
+#define NV34TCL_TX_OFFSET__SIZE 0x00000008
#define NV34TCL_TX_FORMAT(x) (0x00001a04+((x)*32))
-#define NV34TCL_TX_FORMAT__SIZE 0x00000004
+#define NV34TCL_TX_FORMAT__SIZE 0x00000008
#define NV34TCL_TX_FORMAT_DMA0 (1 << 0)
#define NV34TCL_TX_FORMAT_DMA1 (1 << 1)
#define NV34TCL_TX_FORMAT_CUBIC (1 << 2)
@@ -6408,7 +6408,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NV34TCL_TX_FORMAT_BASE_SIZE_W_SHIFT 28
#define NV34TCL_TX_FORMAT_BASE_SIZE_W_MASK 0xf0000000
#define NV34TCL_TX_WRAP(x) (0x00001a08+((x)*32))
-#define NV34TCL_TX_WRAP__SIZE 0x00000004
+#define NV34TCL_TX_WRAP__SIZE 0x00000008
#define NV34TCL_TX_WRAP_S_SHIFT 0
#define NV34TCL_TX_WRAP_S_MASK 0x000000ff
#define NV34TCL_TX_WRAP_S_REPEAT 0x00000001
@@ -6443,7 +6443,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NV34TCL_TX_WRAP_RCOMP_LEQUAL 0x60000000
#define NV34TCL_TX_WRAP_RCOMP_ALWAYS 0x70000000
#define NV34TCL_TX_ENABLE(x) (0x00001a0c+((x)*32))
-#define NV34TCL_TX_ENABLE__SIZE 0x00000004
+#define NV34TCL_TX_ENABLE__SIZE 0x00000008
#define NV34TCL_TX_ENABLE_ANISO_SHIFT 4
#define NV34TCL_TX_ENABLE_ANISO_MASK 0x00000030
#define NV34TCL_TX_ENABLE_ANISO_NONE 0x00000000
@@ -6456,7 +6456,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NV34TCL_TX_ENABLE_MIPMAP_MIN_LOD_MASK 0x3c000000
#define NV34TCL_TX_ENABLE_ENABLE (1 << 30)
#define NV34TCL_TX_SWIZZLE(x) (0x00001a10+((x)*32))
-#define NV34TCL_TX_SWIZZLE__SIZE 0x00000004
+#define NV34TCL_TX_SWIZZLE__SIZE 0x00000008
#define NV34TCL_TX_SWIZZLE_S0_X_SHIFT 14
#define NV34TCL_TX_SWIZZLE_S0_X_MASK 0x0000c000
#define NV34TCL_TX_SWIZZLE_S0_X_ZERO 0x00000000
@@ -6504,7 +6504,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NV34TCL_TX_SWIZZLE_RECT_PITCH_SHIFT 16
#define NV34TCL_TX_SWIZZLE_RECT_PITCH_MASK 0xffff0000
#define NV34TCL_TX_FILTER(x) (0x00001a14+((x)*32))
-#define NV34TCL_TX_FILTER__SIZE 0x00000004
+#define NV34TCL_TX_FILTER__SIZE 0x00000008
#define NV34TCL_TX_FILTER_LOD_BIAS_SHIFT 8
#define NV34TCL_TX_FILTER_LOD_BIAS_MASK 0x00000f00
#define NV34TCL_TX_FILTER_MINIFY_SHIFT 16
@@ -6524,13 +6524,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NV34TCL_TX_FILTER_SIGNED_RED (1 << 30)
#define NV34TCL_TX_FILTER_SIGNED_ALPHA (1 << 31)
#define NV34TCL_TX_NPOT_SIZE(x) (0x00001a18+((x)*32))
-#define NV34TCL_TX_NPOT_SIZE__SIZE 0x00000004
+#define NV34TCL_TX_NPOT_SIZE__SIZE 0x00000008
#define NV34TCL_TX_NPOT_SIZE_H_SHIFT 0
#define NV34TCL_TX_NPOT_SIZE_H_MASK 0x0000ffff
#define NV34TCL_TX_NPOT_SIZE_W_SHIFT 16
#define NV34TCL_TX_NPOT_SIZE_W_MASK 0xffff0000
#define NV34TCL_TX_BORDER_COLOR(x) (0x00001a1c+((x)*32))
-#define NV34TCL_TX_BORDER_COLOR__SIZE 0x00000004
+#define NV34TCL_TX_BORDER_COLOR__SIZE 0x00000008
#define NV34TCL_TX_BORDER_COLOR_B_SHIFT 0
#define NV34TCL_TX_BORDER_COLOR_B_MASK 0x000000ff
#define NV34TCL_TX_BORDER_COLOR_G_SHIFT 8