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

zink: use u_minify for sparse calcs

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29152>
This commit is contained in:
Mike Blumenkrantz
2024-05-03 08:34:52 -04:00
committed by Marge Bot
parent 1232bcc470
commit 920e2a5219
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_bo.c
+5 -5
View File
@@ -1001,9 +1001,9 @@ zink_bo_commit(struct zink_context *ctx, struct zink_resource *res, unsigned lev
bool commits_pending = false;
uint32_t va_page_offset = 0;
for (unsigned l = 0; l < level; l++) {
unsigned mipwidth = DIV_ROUND_UP(MAX2(res->base.b.width0 >> l, 1), gwidth);
unsigned mipheight = DIV_ROUND_UP(MAX2(res->base.b.height0 >> l, 1), gheight);
unsigned mipdepth = DIV_ROUND_UP(res->base.b.array_size > 1 ? res->base.b.array_size : MAX2(res->base.b.depth0 >> l, 1), gdepth);
unsigned mipwidth = DIV_ROUND_UP(u_minify(res->base.b.width0, l), gwidth);
unsigned mipheight = DIV_ROUND_UP(u_minify(res->base.b.height0, l), gheight);
unsigned mipdepth = DIV_ROUND_UP(res->base.b.array_size > 1 ? res->base.b.array_size : u_minify(res->base.b.depth0, l), gdepth);
va_page_offset += mipwidth * mipheight * mipdepth;
}
for (unsigned d = 0; d < ndepth; d++) {
@@ -1025,8 +1025,8 @@ zink_bo_commit(struct zink_context *ctx, struct zink_resource *res, unsigned lev
ibind[i].extent.height = (h == nheight - 1) ? lastBlockExtent.height : gheight;
ibind[i].extent.depth = (d == ndepth - 1 && res->base.b.target != PIPE_TEXTURE_CUBE) ? lastBlockExtent.depth : gdepth;
uint32_t va_page = va_page_offset +
(d + (box->z / gdepth)) * ((MAX2(res->base.b.width0 >> level, 1) / gwidth) * (MAX2(res->base.b.height0 >> level, 1) / gheight)) +
(h + (box->y / gheight)) * (MAX2(res->base.b.width0 >> level, 1) / gwidth) +
(d + (box->z / gdepth)) * (u_minify(res->base.b.width0, level) / gwidth) * (u_minify(res->base.b.height0, level) / gheight) +
(h + (box->y / gheight)) * (u_minify(res->base.b.width0, level) / gwidth) +
(w + (box->x / gwidth));
uint32_t end_va_page = va_page + 1;