diff options
| author | Brian Paul <[email protected]> | 2011-10-23 10:44:47 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-10-23 10:44:47 -0600 |
| commit | 6e0f9001fe3fb191c2928bd09aa9e9d05ddf4ea9 (patch) | |
| tree | 4e2089a6790e76a4210ffc9d0f9aebf5c28adb40 /src/mesa/drivers/dri/intel/intel_mipmap_tree.c | |
| parent | 33abbd4fbdb3149df5ecc296b04a79225962e433 (diff) | |
mesa: move gl_texture_image::Data, RowStride, ImageOffsets to swrast
Only swrast and the drivers that fall back to swrast need these fields now.
This removes the last of the fields related to software rendering from
gl_texture_image.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_mipmap_tree.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index bf6a0f6b71e..c5ef38b7596 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -417,8 +417,8 @@ intel_miptree_copy_teximage(struct intel_context *intel, dst_mt, dst_x, dst_y, dst_mt->region->pitch * dst_mt->region->cpp, width, height); - src = intelImage->base.Base.Data; - src += (intelImage->base.Base.RowStride * + src = intelImage->base.Data; + src += (intelImage->base.RowStride * intelImage->base.Base.Height * dst_mt->region->cpp * slice); @@ -429,7 +429,7 @@ intel_miptree_copy_teximage(struct intel_context *intel, dst_x, dst_y, width, height, src, - intelImage->base.Base.RowStride, + intelImage->base.RowStride, 0, 0); intel_region_unmap(intel, dst_mt->region); @@ -437,8 +437,8 @@ intel_miptree_copy_teximage(struct intel_context *intel, } if (!src_mt) { - _mesa_free_texmemory(intelImage->base.Base.Data); - intelImage->base.Base.Data = NULL; + _mesa_free_texmemory(intelImage->base.Data); + intelImage->base.Data = NULL; } intel_miptree_reference(&intelImage->mt, dst_mt); |