diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-12-04 00:35:14 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-12-04 00:35:14 +0100 |
| commit | 9c6a9363ef96c00dd0ad63e340b32479e43fea45 (patch) | |
| tree | c1752752623301c7bc63d25173c396794b74922d /src/gallium/drivers/trace/tr_screen.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/drivers/trace/tr_screen.c')
| -rw-r--r-- | src/gallium/drivers/trace/tr_screen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c index 7da9bd3866..f69f7da000 100644 --- a/src/gallium/drivers/trace/tr_screen.c +++ b/src/gallium/drivers/trace/tr_screen.c @@ -35,6 +35,7 @@ #include "tr_screen.h" #include "pipe/p_inlines.h" +#include "pipe/p_format.h" static boolean trace = FALSE; @@ -424,7 +425,7 @@ trace_screen_transfer_unmap(struct pipe_screen *_screen, struct pipe_transfer *transfer = tr_trans->transfer; if(tr_trans->map) { - size_t size = transfer->nblocksy * transfer->stride; + size_t size = pf_get_nblocksy(transfer->texture->format, transfer->width) * transfer->stride; trace_dump_call_begin("pipe_screen", "transfer_write"); |