Module: Mesa
Branch: master
Commit: 8b60bf4e9f37aa1c7bd19fed67ec50aedb9a0bee
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b60bf4e9f37aa1c7bd19fed67ec50aedb9a0bee
Author: Jakob Bornecrantz <ja...@vmware.com>
Date: Wed Dec 15 12:17:06 2010 +0100
wrapper: Fix width and height given to map and remove uneeded fields
---
src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
index 8f9a908..77220cf 100644
--- a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
+++ b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
@@ -61,10 +61,8 @@ struct wrapper_sw_displaytarget
struct pipe_resource *tex;
struct pipe_transfer *transfer;
- unsigned width;
- unsigned height;
unsigned map_count;
- unsigned stride; /**< because we give stride at create */
+ unsigned stride; /**< because we get stride at create */
void *ptr;
};
@@ -95,7 +93,7 @@ wsw_dt_get_stride(struct wrapper_sw_displaytarget *wdt,
unsigned *stride)
tr = pipe_get_transfer(pipe, tex, 0, 0,
PIPE_TRANSFER_READ_WRITE,
- 0, 0, wdt->width, wdt->height);
+ 0, 0, wdt->tex->width0, wdt->tex->height0);
if (!tr)
return FALSE;
@@ -208,7 +206,7 @@ wsw_dt_map(struct sw_winsys *ws,
tr = pipe_get_transfer(pipe, tex, 0, 0,
PIPE_TRANSFER_READ_WRITE,
- 0, 0, wdt->width, wdt->height);
+ 0, 0, wdt->tex->width0, wdt->tex->height0);
if (!tr)
return NULL;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
