summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorXiang, Haihao <[email protected]>2008-01-02 11:38:51 +0800
committerXiang, Haihao <[email protected]>2008-01-02 11:38:51 +0800
commit60d762aa625095a8c1f9597d8530bb5a6fa61b4c (patch)
tree2c735f00841f721ac2475af11f8e66eff69619f9 /src/mesa
parent524304c9b8b85dd32ea8c90aafa79229e928f250 (diff)
i915: Needn't adjust pixel centers. fix #12944
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i915/intel_state.c4
-rw-r--r--src/mesa/drivers/dri/i915/intel_tris.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_state.c b/src/mesa/drivers/dri/i915/intel_state.c
index 558f068a42c..4bcc9af2b60 100644
--- a/src/mesa/drivers/dri/i915/intel_state.c
+++ b/src/mesa/drivers/dri/i915/intel_state.c
@@ -253,10 +253,10 @@ intelCalcViewport(GLcontext * ctx)
}
m[MAT_SX] = v[MAT_SX];
- m[MAT_TX] = v[MAT_TX] + SUBPIXEL_X;
+ m[MAT_TX] = v[MAT_TX];
m[MAT_SY] = v[MAT_SY] * yScale;
- m[MAT_TY] = v[MAT_TY] * yScale + yBias + SUBPIXEL_Y;
+ m[MAT_TY] = v[MAT_TY] * yScale + yBias;
m[MAT_SZ] = v[MAT_SZ] * depthScale;
m[MAT_TZ] = v[MAT_TZ] * depthScale;
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 61b0bb3fd31..6ccb5026711 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -247,8 +247,8 @@ intel_draw_point(struct intel_context *intel, intelVertexPtr v0)
int j;
/* Adjust for sub pixel position -- still required for conform. */
- *(float *) &vb[0] = v0->v.x - 0.125;
- *(float *) &vb[1] = v0->v.y - 0.125;
+ *(float *) &vb[0] = v0->v.x;
+ *(float *) &vb[1] = v0->v.y;
for (j = 2; j < vertsize; j++)
vb[j] = v0->ui[j];
}