fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallium/aux: Fix MSVC warning C4334 (32bit shift cast to 64bit)

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-By: Bill Kristiansen <billkris@microsoft.com>
Cc: mesa-stable@lists.freedesktop.org
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10331>
(cherry picked from commit 4a3f044473)
This commit is contained in:
Jesse Natalie 2021-04-19 11:53:04 -07:00 • committed by Eric Engestrom
parent 70687cdbe6
commit 0ead3bc280
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -391,7 +391,7 @@
"description": "gallium/aux: Fix MSVC warning C4334 (32bit shift cast to 64bit)",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

2
src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
View file

@ -232,7 +232,7 @@ pb_cache_manager_create_buffer(struct pb_manager *_mgr,
}
assert(pipe_is_referenced(&buf->buffer->reference));
assert(pb_check_alignment(desc->alignment, 1 << buf->buffer->alignment_log2));
assert(pb_check_alignment(desc->alignment, 1ull << buf->buffer->alignment_log2));
assert(buf->buffer->size >= size);
pipe_reference_init(&buf->base.reference, 1);

2
src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
View file

@ -399,7 +399,7 @@ pb_debug_manager_create_buffer(struct pb_manager *_mgr,
}
assert(pipe_is_referenced(&buf->buffer->reference));
assert(pb_check_alignment(real_desc.alignment, 1 << buf->buffer->alignment_log2));
assert(pb_check_alignment(real_desc.alignment, 1ull << buf->buffer->alignment_log2));
assert(pb_check_usage(real_desc.usage, buf->buffer->usage));
assert(buf->buffer->size >= real_size);

2
src/gallium/auxiliary/pipebuffer/pb_cache.c
View file

@ -133,7 +133,7 @@ pb_cache_is_buffer_compat(struct pb_cache_entry *entry,
if (usage & mgr->bypass_usage)
return 0;
if (!pb_check_alignment(alignment, 1 << buf->alignment_log2))
if (!pb_check_alignment(alignment, 1ull << buf->alignment_log2))
return 0;
return mgr->can_reclaim(mgr->winsys, buf) ? 1 : -1;