diff options
| author | Brian Paul <[email protected]> | 2012-01-16 10:54:41 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-01-27 17:43:21 -0800 |
| commit | a42dcf1614cae7a1f896eb934c99c78dfd36c1d8 (patch) | |
| tree | 6e3959eed34fa083fa3a724b87ad6ca3fdee8753 /src/mesa/swrast/s_texfetch_tmp.h | |
| parent | 573e1478eb789230efcad952b5fdbe902375d867 (diff) | |
swrast: s/Data/Map/ in swrast_texture_image
To indicate that it points to mapped texture memory.
(cherry picked from commit bd3c10c0f0c60ab3421c2da2eab814edc2296cb0)
Diffstat (limited to 'src/mesa/swrast/s_texfetch_tmp.h')
| -rw-r--r-- | src/mesa/swrast/s_texfetch_tmp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index 877c29c9b74..f1a2ed699ea 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -43,7 +43,7 @@ #if DIM == 1 #define TEXEL_ADDR( type, image, i, j, k, size ) \ - ((void) (j), (void) (k), ((type *)(image)->Data + (i) * (size))) + ((void) (j), (void) (k), ((type *)(image)->Map + (i) * (size))) #define FETCH(x) fetch_texel_1d_##x @@ -51,14 +51,14 @@ #define TEXEL_ADDR( type, image, i, j, k, size ) \ ((void) (k), \ - ((type *)(image)->Data + ((image)->RowStride * (j) + (i)) * (size))) + ((type *)(image)->Map + ((image)->RowStride * (j) + (i)) * (size))) #define FETCH(x) fetch_texel_2d_##x #elif DIM == 3 #define TEXEL_ADDR( type, image, i, j, k, size ) \ - ((type *)(image)->Data + ((image)->ImageOffsets[k] \ + ((type *)(image)->Map + ((image)->ImageOffsets[k] \ + (image)->RowStride * (j) + (i)) * (size)) #define FETCH(x) fetch_texel_3d_##x |