diff options
| author | Eric Anholt <[email protected]> | 2013-04-19 11:44:53 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-04-30 10:40:43 -0700 |
| commit | 0c883e46d871797cd1141498850d51cde6e54b76 (patch) | |
| tree | 54019d9f77240229e7da69de95be45eb47de4984 /src/mesa/swrast/s_texfetch_tmp.h | |
| parent | e7ecc11311d142a8ac919627011372a265224bcd (diff) | |
swrast: Replace ImageOffsets with an ImageSlices pointer.
This is a step toward allowing drivers to use their normal mapping paths,
instead of requiring that all slice mappings come from an aligned offset
from the first slice's map.
This incidentally fixes missing slice handling in FXT1 swrast.
v2: Use slice height helper function.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/swrast/s_texfetch_tmp.h')
| -rw-r--r-- | src/mesa/swrast/s_texfetch_tmp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h index 7f09683630c..cf8f61fefdc 100644 --- a/src/mesa/swrast/s_texfetch_tmp.h +++ b/src/mesa/swrast/s_texfetch_tmp.h @@ -59,8 +59,8 @@ #elif DIM == 3 #define TEXEL_ADDR( type, image, i, j, k, size ) \ - ((type *)(image)->Map + ((image)->ImageOffsets[k] \ - + (image)->RowStride * (j) + (i)) * (size)) + ((type *)(image)->ImageSlices[k] + \ + ((image)->RowStride * (j) + (i)) * (size)) #define FETCH(x) fetch_texel_3d_##x |