fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: fix copy box iteration when adding

Browse source 
need to use the iterator, not the base pointer

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21921>
This commit is contained in:
Mike Blumenkrantz 2023-03-15 08:08:42 -04:00 • committed by Marge Bot
parent 6185e4f2ff
commit 32f74c4db5
1 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
src/gallium/drivers/zink/zink_resource.c
View file

@ -2216,21 +2216,21 @@ zink_resource_copy_box_add(struct zink_resource *res, unsigned level, const stru
case PIPE_BUFFER:
case PIPE_TEXTURE_1D:
/* no-op included region */
if (b->x <= box->x && b->x + b->width >= box->x + box->width)
if (b[i].x <= box->x && b[i].x + b[i].width >= box->x + box->width)
return;
/* try to merge adjacent regions */
if (b->x == box->x + box->width) {
b->x -= box->width;
if (b[i].x == box->x + box->width) {
b[i].x -= box->width;
return;
}
if (b->x + b->width == box->x) {
b->width += box->width;
if (b[i].x + b[i].width == box->x) {
b[i].width += box->width;
return;
}
/* try to merge into region */
if (box->x <= b->x && box->x + box->width >= b->x + b->width) {
if (box->x <= b[i].x && box->x + box->width >= b[i].x + b[i].width) {
*b = *box;
return;
}
@ -2239,34 +2239,34 @@ zink_resource_copy_box_add(struct zink_resource *res, unsigned level, const stru
case PIPE_TEXTURE_1D_ARRAY:
case PIPE_TEXTURE_2D:
/* no-op included region */
if (b->x <= box->x && b->x + b->width >= box->x + box->width &&
b->y <= box->y && b->y + b->height >= box->y + box->height)
if (b[i].x <= box->x && b[i].x + b[i].width >= box->x + box->width &&
b[i].y <= box->y && b[i].y + b[i].height >= box->y + box->height)
return;
/* try to merge adjacent regions */
if (b->y == box->y && b->height == box->height) {
if (b->x == box->x + box->width) {
b->x -= box->width;
if (b[i].y == box->y && b[i].height == box->height) {
if (b[i].x == box->x + box->width) {
b[i].x -= box->width;
return;
}
if (b->x + b->width == box->x) {
b->width += box->width;
if (b[i].x + b[i].width == box->x) {
b[i].width += box->width;
return;
}
} else if (b->x == box->x && b->width == box->width) {
if (b->y == box->y + box->height) {
b->y -= box->height;
} else if (b[i].x == box->x && b[i].width == box->width) {
if (b[i].y == box->y + box->height) {
b[i].y -= box->height;
return;
}
if (b->y + b->height == box->y) {
b->height += box->height;
if (b[i].y + b[i].height == box->y) {
b[i].height += box->height;
return;
}
}
/* try to merge into region */
if (box->x <= b->x && box->x + box->width >= b->x + b->width &&
box->y <= b->y && box->y + box->height >= b->y + b->height) {
if (box->x <= b[i].x && box->x + box->width >= b[i].x + b[i].width &&
box->y <= b[i].y && box->y + box->height >= b[i].y + b[i].height) {
*b = *box;
return;
}
@ -2274,78 +2274,78 @@ zink_resource_copy_box_add(struct zink_resource *res, unsigned level, const stru
default:
/* no-op included region */
if (b->x <= box->x && b->x + b->width >= box->x + box->width &&
b->y <= box->y && b->y + b->height >= box->y + box->height &&
b->z <= box->z && b->z + b->depth >= box->z + box->depth)
if (b[i].x <= box->x && b[i].x + b[i].width >= box->x + box->width &&
b[i].y <= box->y && b[i].y + b[i].height >= box->y + box->height &&
b[i].z <= box->z && b[i].z + b[i].depth >= box->z + box->depth)
return;
/* try to merge adjacent regions */
if (b->z == box->z && b->depth == box->depth) {
if (b->y == box->y && b->height == box->height) {
if (b->x == box->x + box->width) {
b->x -= box->width;
if (b[i].z == box->z && b[i].depth == box->depth) {
if (b[i].y == box->y && b[i].height == box->height) {
if (b[i].x == box->x + box->width) {
b[i].x -= box->width;
return;
}
if (b->x + b->width == box->x) {
b->width += box->width;
if (b[i].x + b[i].width == box->x) {
b[i].width += box->width;
return;
}
} else if (b->x == box->x && b->width == box->width) {
if (b->y == box->y + box->height) {
b->y -= box->height;
} else if (b[i].x == box->x && b[i].width == box->width) {
if (b[i].y == box->y + box->height) {
b[i].y -= box->height;
return;
}
if (b->y + b->height == box->y) {
b->height += box->height;
if (b[i].y + b[i].height == box->y) {
b[i].height += box->height;
return;
}
}
} else if (b->x == box->x && b->width == box->width) {
if (b->y == box->y && b->height == box->height) {
if (b->z == box->z + box->depth) {
b->z -= box->depth;
} else if (b[i].x == box->x && b[i].width == box->width) {
if (b[i].y == box->y && b[i].height == box->height) {
if (b[i].z == box->z + box->depth) {
b[i].z -= box->depth;
return;
}
if (b->z + b->depth == box->z) {
b->depth += box->depth;
if (b[i].z + b[i].depth == box->z) {
b[i].depth += box->depth;
return;
}
} else if (b->z == box->z && b->depth == box->depth) {
if (b->y == box->y + box->height) {
b->y -= box->height;
} else if (b[i].z == box->z && b[i].depth == box->depth) {
if (b[i].y == box->y + box->height) {
b[i].y -= box->height;
return;
}
if (b->y + b->height == box->y) {
b->height += box->height;
if (b[i].y + b[i].height == box->y) {
b[i].height += box->height;
return;
}
}
} else if (b->y == box->y && b->height == box->height) {
if (b->z == box->z && b->depth == box->depth) {
if (b->x == box->x + box->width) {
b->x -= box->width;
} else if (b[i].y == box->y && b[i].height == box->height) {
if (b[i].z == box->z && b[i].depth == box->depth) {
if (b[i].x == box->x + box->width) {
b[i].x -= box->width;
return;
}
if (b->x + b->width == box->x) {
b->width += box->width;
if (b[i].x + b[i].width == box->x) {
b[i].width += box->width;
return;
}
} else if (b->x == box->x && b->width == box->width) {
if (b->z == box->z + box->depth) {
b->z -= box->depth;
} else if (b[i].x == box->x && b[i].width == box->width) {
if (b[i].z == box->z + box->depth) {
b[i].z -= box->depth;
return;
}
if (b->z + b->depth == box->z) {
b->depth += box->depth;
if (b[i].z + b[i].depth == box->z) {
b[i].depth += box->depth;
return;
}
}
}
/* try to merge into region */
if (box->x <= b->x && box->x + box->width >= b->x + b->width &&
box->y <= b->y && box->y + box->height >= b->y + b->height &&
box->z <= b->z && box->z + box->depth >= b->z + b->depth)
if (box->x <= b[i].x && box->x + box->width >= b[i].x + b[i].width &&
box->y <= b[i].y && box->y + box->height >= b[i].y + b[i].height &&
box->z <= b[i].z && box->z + box->depth >= b[i].z + b[i].depth)
return;
break;