From 282540ae9eea429d38ab405a5fd1911a4e0ae3cc Mon Sep 17 00:00:00 2001 From: Sil Vilerino Date: Wed, 13 Sep 2023 07:38:43 -0400 Subject: [PATCH] aux/tc: Add ASSERTED to unreferenced release build variable Fixes MSVC build error src/gallium/auxiliary/util/u_threaded_context.c(3184): error C4189: 'size': local variable is initialized but not referenced Fixes: 51ad269198e ("aux/tc: handle stride mismatch during rp-optimized subdata") Reviewed-By: Mike Blumenkrantz Part-of: (cherry picked from commit d48f2469bea263e114ae125abb742a7422ce8f71) --- .pick_status.json | 2 +- src/gallium/auxiliary/util/u_threaded_context.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8d9550465a7..60ec916758c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2020,7 +2020,7 @@ "description": "aux/tc: Add ASSERTED to unreferenced release build variable", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "51ad269198e425fae719a37f169b365a8b52e7f3" }, diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c index de2b92c8ee1..38b0e7cea03 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.c +++ b/src/gallium/auxiliary/util/u_threaded_context.c @@ -3182,7 +3182,7 @@ tc_texture_subdata(struct pipe_context *_pipe, width *= blocksize; if (width == fmt_stride && width == (unsigned)stride) { - uint64_t size = (uint64_t)height * width; + ASSERTED uint64_t size = (uint64_t)height * width; assert(size <= SIZE_MAX); assert(dst_x + src_box.width < u_minify(pres->width0, level));