diff options
| author | Brian Paul <brianp@vmware.com> | 2008-12-19 16:56:56 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2008-12-19 16:56:56 -0700 |
| commit | 58a82ee57f1e1e67387dd860ac253223db250789 (patch) | |
| tree | 031ee528fc49bec03d767c8c697f40d15a9ed616 /src/mesa/drivers/dri/intel/intel_pixel_copy.c | |
| parent | 9c8db8685432fedd068157795422764ce96b89a0 (diff) | |
| parent | f83f5ec8f5f1159cfd0ec2596ceab725c073266e (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_pixel_copy.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_copy.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_copy.c b/src/mesa/drivers/dri/intel/intel_pixel_copy.c index 61d1296c26..447c6494e7 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_copy.c @@ -266,6 +266,9 @@ do_blit_copypixels(GLcontext * ctx, drm_clip_rect_t *cliprects; int x_off, y_off; + /* Update draw buffer bounds */ + _mesa_update_state(ctx); + /* Copypixels can be more than a straight copy. Ensure all the * extra operations are disabled: */ @@ -308,8 +311,8 @@ do_blit_copypixels(GLcontext * ctx, /* Clip to source buffer. */ orig_srcx = srcx; orig_srcy = srcy; - if (!_mesa_clip_to_region(read_fb->_Xmin, read_fb->_Ymin, - read_fb->_Xmax, read_fb->_Ymax, + if (!_mesa_clip_to_region(0, 0, + read_fb->Width, read_fb->Height, &srcx, &srcy, &width, &height)) goto out; /* Adjust dst coords for our post-clipped source origin */ |