diff options
author | Chris Forbes <chrisf@ijw.co.nz> | 2014-01-20 20:19:35 +1300 |
---|---|---|
committer | Chris Forbes <chrisf@ijw.co.nz> | 2014-04-10 18:27:41 +1200 |
commit | 5de52541e52d0a14d70ef7472d08cdc650d4a222 (patch) | |
tree | f00683baeb51f2cd12ea02766c5169819a22f684 /src/mesa/drivers/dri/i965 | |
parent | ba3499ba01135c54d9b28a4bae916845cdbb64b7 (diff) | |
download | external_mesa3d-5de52541e52d0a14d70ef7472d08cdc650d4a222.zip external_mesa3d-5de52541e52d0a14d70ef7472d08cdc650d4a222.tar.gz external_mesa3d-5de52541e52d0a14d70ef7472d08cdc650d4a222.tar.bz2 |
i965: Account for MinLevel in texture upload fast path
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/i965')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_subimage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c index 7143ab7..287b27b 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c @@ -634,9 +634,11 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx, packing->Alignment, packing->RowLength, packing->SkipPixels, packing->SkipRows, for_glTexImage); + int level = texImage->Level + texImage->TexObject->MinLevel; + /* Adjust x and y offset based on miplevel */ - xoffset += image->mt->level[texImage->Level].level_x; - yoffset += image->mt->level[texImage->Level].level_y; + xoffset += image->mt->level[level].level_x; + yoffset += image->mt->level[level].level_y; linear_to_tiled( xoffset * cpp, (xoffset + width) * cpp, |