KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: clean up some if-statment code

This commit is contained in:
Brian Paul 2009-03-18 10:21:05 -06:00
parent 9808ae688a
commit a0509f7d28
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mesa/state_tracker/st_cb_texture.c
View File

@ -465,18 +465,17 @@ st_TexImage(GLcontext * ctx,
* bmBufferData with NULL data to free the old block and avoid * bmBufferData with NULL data to free the old block and avoid
* waiting on any outstanding fences. * waiting on any outstanding fences.
*/ */
if (stObj->pt && if (stObj->pt) {
(stObj->teximage_realloc || if (stObj->teximage_realloc ||
(/*stObj->pt->first_level == level &&*/ (stObj->pt->last_level == level &&
stObj->pt->last_level == level && stObj->pt->target != PIPE_TEXTURE_CUBE &&
stObj->pt->target != PIPE_TEXTURE_CUBE && !st_texture_match_image(stObj->pt, &stImage->base,
!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);
DBG("release it\n"); assert(!stObj->pt);
pipe_texture_reference(&stObj->pt, NULL); stObj->teximage_realloc = FALSE;
assert(!stObj->pt); }
stObj->teximage_realloc = FALSE;
} }
if (!stObj->pt) { if (!stObj->pt) {