intel: fix i830 comment + backwards VB offsets.

According to Keith the docs have these offsets the other way around

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 06210035af55d9d81c43014f32173d6a251f73bb..797d6c5858718a2132e6c2ee581ff6643148e58f 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -186,7 +186,7 @@ void intel_flush_prim(struct intel_context *intel)
       OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0,
                offset | (intel->vertex_size << S0_VB_PITCH_SHIFT_830) |
                S0_VB_ENABLE_830);
-      /* S1
+      /* S2
        * This is somewhat unfortunate -- VB width is tied up with
        * vertex format data that we've already uploaded through
        * _3DSTATE_VFT[01]_CMD.  We may want to replace emits of VFT state with

diff --git a/src/mesa/drivers/dri/intel/intel_reg.h b/src/mesa/drivers/dri/intel/intel_reg.h
index cd4654aab427f0d5e711a53a9dee7c4966712fe7..68d8a05b83620e646281943903e9a52b4bd7a781 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_reg.h
+++ b/src/mesa/drivers/dri/intel/intel_reg.h
@@ -100,8 +100,8 @@
 #define S2_TEXCOORD_FMT(unit, type)    ((type)<<(unit*4))
 #define S2_TEXCOORD_NONE               (~0)
 #define S2_TEX_COUNT_SHIFT_830         12
-#define S2_VERTEX_0_WIDTH_SHIFT_830    0
-#define S2_VERTEX_1_WIDTH_SHIFT_830    6
+#define S2_VERTEX_1_WIDTH_SHIFT_830    0
+#define S2_VERTEX_0_WIDTH_SHIFT_830    6
 /* S3 not interesting */
 
 #define S4_POINT_WIDTH_SHIFT           23