i915: Needn't adjust pixel centers. fix #12944

diff --git a/src/mesa/drivers/dri/i915/intel_state.c b/src/mesa/drivers/dri/i915/intel_state.c
index 558f068a42ccbab20888665a04e64e2ebe75bbfb..4bcc9af2b606ec8971b156662911e636117e049d 100644 (file)
--- 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 61b0bb3fd31507fceecc033acdbd2fa1443cc384..6ccb5026711eec9ea6ced3f322587cea4e1e4743 100644 (file)
--- 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];
 }