st: clean up some if-statment code
This commit is contained in:
parent
9808ae688a
commit
a0509f7d28
|
@ -465,19 +465,18 @@ st_TexImage(GLcontext * ctx,
|
|||
* bmBufferData with NULL data to free the old block and avoid
|
||||
* waiting on any outstanding fences.
|
||||
*/
|
||||
if (stObj->pt &&
|
||||
(stObj->teximage_realloc ||
|
||||
(/*stObj->pt->first_level == level &&*/
|
||||
stObj->pt->last_level == level &&
|
||||
if (stObj->pt) {
|
||||
if (stObj->teximage_realloc ||
|
||||
(stObj->pt->last_level == level &&
|
||||
stObj->pt->target != PIPE_TEXTURE_CUBE &&
|
||||
!st_texture_match_image(stObj->pt, &stImage->base,
|
||||
stImage->face, stImage->level)))) {
|
||||
|
||||
stImage->face, stImage->level))) {
|
||||
DBG("release it\n");
|
||||
pipe_texture_reference(&stObj->pt, NULL);
|
||||
assert(!stObj->pt);
|
||||
stObj->teximage_realloc = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
if (!stObj->pt) {
|
||||
guess_and_alloc_texture(ctx->st, stObj, stImage);
|
||||
|
|
Loading…
Reference in New Issue