softpipe: minor code movement in softpipe_get_tex_transfer()

This commit is contained in:
Brian Paul 2009-02-24 08:33:50 -07:00
parent 66ddf1a00f
commit d6677fd9bc
1 changed files with 5 additions and 4 deletions

View File

@ -283,14 +283,13 @@ softpipe_get_tex_transfer(struct pipe_screen *screen,
{
struct softpipe_texture *sptex = softpipe_texture(texture);
struct softpipe_transfer *spt;
struct pipe_transfer *pt;
assert(texture);
assert(level <= texture->last_level);
spt = CALLOC_STRUCT(softpipe_transfer);
pt = &spt->base;
if (spt) {
struct pipe_transfer *pt = &spt->base;
pt->refcount = 1;
pipe_texture_reference(&pt->texture, texture);
pt->format = texture->format;
@ -302,12 +301,13 @@ softpipe_get_tex_transfer(struct pipe_screen *screen,
pt->nblocksx = texture->nblocksx[level];
pt->nblocksy = texture->nblocksy[level];
pt->stride = sptex->stride[level];
spt->offset = sptex->level_offset[level];
pt->usage = usage;
pt->face = face;
pt->level = level;
pt->zslice = zslice;
spt->offset = sptex->level_offset[level];
if (texture->target == PIPE_TEXTURE_CUBE ||
texture->target == PIPE_TEXTURE_3D) {
spt->offset += ((texture->target == PIPE_TEXTURE_CUBE) ? face :
@ -317,8 +317,9 @@ softpipe_get_tex_transfer(struct pipe_screen *screen,
assert(face == 0);
assert(zslice == 0);
}
return pt;
}
return pt;
return NULL;
}