OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: avoid overflow when clamping bufferviews

Browse Source 
cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18784>
(cherry picked from commit 084f3b6664)
This commit is contained in:
Mike Blumenkrantz
2022-09-07 13:21:28 -04:00
committed by Dylan Baker
parent 01edc6f174
commit 883c0f7b2f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -571,7 +571,7 @@
"description": "zink: avoid overflow when clamping bufferviews", "description": "zink: avoid overflow when clamping bufferviews",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null "because_sha": null
}, },

2
src/gallium/drivers/zink/zink_context.c
View File

@@ -800,7 +800,7 @@ create_bvci(struct zink_context *ctx, struct zink_resource *res, enum pipe_forma
if (bvci.offset + bvci.range >= res->base.b.width0) if (bvci.offset + bvci.range >= res->base.b.width0)
bvci.range = VK_WHOLE_SIZE; bvci.range = VK_WHOLE_SIZE;
} }
uint32_t clamp = blocksize * screen->info.props.limits.maxTexelBufferElements; uint64_t clamp = blocksize * screen->info.props.limits.maxTexelBufferElements;
if (bvci.range == VK_WHOLE_SIZE && res->base.b.width0 > clamp) if (bvci.range == VK_WHOLE_SIZE && res->base.b.width0 > clamp)
bvci.range = clamp; bvci.range = clamp;
bvci.flags = 0; bvci.flags = 0;