diff options
author | Brian Paul <brianp@vmware.com> | 2009-10-28 11:33:51 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-10-28 11:33:51 -0600 |
commit | 7d56caabe45e91a67096804c7e341d04d01db7aa (patch) | |
tree | 1632cea88f33bf4fe39d198185596d05d44d83bb /src/mesa/drivers/dri/intel/intel_span.c | |
parent | 182ff3e47a2d18917cdf3344c2ce95bd0a460784 (diff) | |
parent | 0219cd0961e6b47761fe6984dc6c0a8bfa6057d8 (diff) |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_lexer.l
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_span.c')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_span.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c index dcfcad1d95..e3869c8c1d 100644 --- a/src/mesa/drivers/dri/intel/intel_span.c +++ b/src/mesa/drivers/dri/intel/intel_span.c @@ -163,6 +163,9 @@ static uint32_t x_tile_swizzle(struct intel_renderbuffer *irb, int x_tile_number, y_tile_number; int tile_off, tile_base; + x += irb->region->draw_x; + y += irb->region->draw_y; + tile_stride = (irb->region->pitch * irb->region->cpp) << 3; xbyte = x * irb->region->cpp; @@ -218,6 +221,9 @@ static uint32_t y_tile_swizzle(struct intel_renderbuffer *irb, int x_tile_number, y_tile_number; int tile_off, tile_base; + x += irb->region->draw_x; + y += irb->region->draw_y; + tile_stride = (irb->region->pitch * irb->region->cpp) << 5; xbyte = x * irb->region->cpp; |