Mesa (master): intel: fix i830 comment + backwards VB offsets.
Dave Airlie
airlied at kemper.freedesktop.org
Thu Nov 20 03:28:07 UTC 2008
Module: Mesa
Branch: master
Commit: 1412ca0be24461cad36de865851484464fac3bfe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1412ca0be24461cad36de865851484464fac3bfe
Author: airlied <airlied at unused-12-215.bne.redhat.com>
Date: Thu Nov 20 21:27:45 2008 +1000
intel: fix i830 comment + backwards VB offsets.
According to Keith the docs have these offsets the other way around
---
src/mesa/drivers/dri/i915/intel_tris.c | 2 +-
src/mesa/drivers/dri/intel/intel_reg.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 0621003..797d6c5 100644
--- 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 cd4654a..68d8a05 100644
--- 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
More information about the mesa-commit
mailing list