diff options
| author | airlied <airlied@unused-12-215.bne.redhat.com> | 2008-11-20 21:27:45 +1000 |
|---|---|---|
| committer | airlied <airlied@unused-12-215.bne.redhat.com> | 2008-11-20 21:27:45 +1000 |
| commit | 1412ca0be24461cad36de865851484464fac3bfe (patch) | |
| tree | 39105aea2d25952d37433ed8a9145d8601a108e6 | |
| parent | 1ea414fdebb3b784a271b36652933564a04e1a02 (diff) | |
intel: fix i830 comment + backwards VB offsets.
According to Keith the docs have these offsets the other way around
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_tris.c | 2 | ||||
| -rw-r--r-- | 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 06210035af..797d6c5858 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 cd4654aab4..68d8a05b83 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 |