Mesa (master): i965: Remove DRI1 leftovers from stipple offset handling.

Eric Anholt anholt at kemper.freedesktop.org
Wed Jan 27 02:27:30 UTC 2010


Module: Mesa
Branch: master
Commit: a3d8e7e48152d88217a409bf366e10497ee75763
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3d8e7e48152d88217a409bf366e10497ee75763

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jan 26 16:35:27 2010 -0800

i965: Remove DRI1 leftovers from stipple offset handling.

---

 src/mesa/drivers/dri/i965/brw_misc_state.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index 7b70f78..f708ee0 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -327,7 +327,7 @@ const struct brw_tracked_state brw_polygon_stipple = {
 
 static void upload_polygon_stipple_offset(struct brw_context *brw)
 {
-   __DRIdrawable *dPriv = brw->intel.driDrawable;
+   GLcontext *ctx = &brw->intel.ctx;
    struct brw_polygon_stipple_offset bpso;
 
    memset(&bpso, 0, sizeof(bpso));
@@ -343,8 +343,8 @@ static void upload_polygon_stipple_offset(struct brw_context *brw)
     * worry about.
     */
    if (brw->intel.ctx.DrawBuffer->Name == 0) {
-      bpso.bits0.x_offset = (32 - (dPriv->x & 31)) & 31;
-      bpso.bits0.y_offset = (32 - ((dPriv->y + dPriv->h) & 31)) & 31;
+      bpso.bits0.x_offset = 0;
+      bpso.bits0.y_offset = (32 - (ctx->DrawBuffer->Height & 31)) & 31;
    }
    else {
       bpso.bits0.y_offset = 0;




More information about the mesa-commit mailing list