fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeon: Remove early dereference of src/dst width in glCopyTexSubImage.

Browse source 
There doesn't appear to be any particular reason for this -- it's not
like the width is changing between the deref and the use.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Eric Anholt 2011-10-17 09:39:48 -07:00
parent d9f2add181
commit e7349a55f7
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/radeon/radeon_tex_copy.c
View file

@ -51,8 +51,6 @@ do_copy_texsubimage(struct gl_context *ctx,
unsigned dst_bpp;
gl_format src_mesaformat;
gl_format dst_mesaformat;
unsigned src_width;
unsigned dst_width;
unsigned flip_y;
if (!radeon->vtbl.blit) {
@ -101,8 +99,6 @@ do_copy_texsubimage(struct gl_context *ctx,
src_mesaformat = rrb->base.Format;
dst_mesaformat = timg->base.Base.TexFormat;
src_width = rrb->base.Width;
dst_width = timg->base.Base.Width;
src_bpp = _mesa_get_format_bytes(src_mesaformat);
dst_bpp = _mesa_get_format_bytes(dst_mesaformat);
if (!radeon->vtbl.check_blit(dst_mesaformat)) {
@ -133,10 +129,10 @@ do_copy_texsubimage(struct gl_context *ctx,
/* blit from src buffer to texture */
return radeon->vtbl.blit(ctx, rrb->bo, src_offset, src_mesaformat, rrb->pitch/rrb->cpp,
src_width, rrb->base.Height, x, y,
rrb->base.Width, rrb->base.Height, x, y,
timg->mt->bo, dst_offset, dst_mesaformat,
timg->mt->levels[level].rowstride / dst_bpp,
dst_width, timg->base.Base.Height,
timg->base.Base.Width, timg->base.Base.Height,
dstx, dsty, width, height, flip_y);
}