diff options
| author | Roland Scheidegger <[email protected]> | 2009-12-04 00:35:14 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2009-12-04 00:35:14 +0100 |
| commit | 9c6a9363ef96c00dd0ad63e340b32479e43fea45 (patch) | |
| tree | c1752752623301c7bc63d25173c396794b74922d /src/gallium/state_trackers/xorg/xorg_crtc.c | |
| parent | cc8a537c57a62a196106b592e510e4c93bd1826e (diff) | |
| parent | 94b5c28a98850f42fbcdab9ceda1450279e1e6fd (diff) | |
Merge branch 'gallium-noblocks'
Conflicts:
src/gallium/state_trackers/xorg/xorg_exa.c
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_crtc.c')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_crtc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c index 9e8c14d741c..03bc6e37c9c 100644 --- a/src/gallium/state_trackers/xorg/xorg_crtc.c +++ b/src/gallium/state_trackers/xorg/xorg_crtc.c @@ -200,7 +200,6 @@ crtc_load_cursor_argb_ga3d(xf86CrtcPtr crtc, CARD32 * image) templat.format = PIPE_FORMAT_A8R8G8B8_UNORM; templat.width0 = 64; templat.height0 = 64; - pf_get_block(templat.format, &templat.block); crtcp->cursor_tex = ms->screen->texture_create(ms->screen, &templat); @@ -216,7 +215,7 @@ crtc_load_cursor_argb_ga3d(xf86CrtcPtr crtc, CARD32 * image) PIPE_TRANSFER_WRITE, 0, 0, 64, 64); ptr = ms->screen->transfer_map(ms->screen, transfer); - util_copy_rect(ptr, &crtcp->cursor_tex->block, + util_copy_rect(ptr, crtcp->cursor_tex->format, transfer->stride, 0, 0, 64, 64, (void*)image, 64 * 4, 0, 0); ms->screen->transfer_unmap(ms->screen, transfer); |