fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 03:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/pb: change alignment to 32 bits

Browse source 
This partially reverts 4a3f0444. The warning is fixed differently.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10993>
This commit is contained in:
Marek Olšák 2021-05-25 16:28:47 -04:00 • committed by Marge Bot
parent 97a5753812
commit 45cbb08848
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/pipebuffer/pb_buffer.h
View file

@ -288,7 +288,7 @@ pb_reference_with_winsys(void *winsys,
* the requested or not.
*/
static inline boolean
pb_check_alignment(pb_size requested, pb_size provided)
pb_check_alignment(uint32_t requested, uint32_t provided)
{
if (!requested)
return TRUE;

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, 1ull << buf->buffer->alignment_log2));
assert(pb_check_alignment(desc->alignment, 1u << 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, 1ull << buf->buffer->alignment_log2));
assert(pb_check_alignment(real_desc.alignment, 1u << buf->buffer->alignment_log2));
assert(pb_check_usage(real_desc.usage, buf->buffer->usage));
assert(buf->buffer->size >= real_size);

4
src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
View file

@ -180,8 +180,8 @@ mm_bufmgr_create_buffer(struct pb_manager *mgr,
struct mm_buffer *mm_buf;
/* We don't handle alignments larger then the one initially setup */
assert(pb_check_alignment(desc->alignment, (pb_size)1 << mm->align2));
if(!pb_check_alignment(desc->alignment, (pb_size)1 << mm->align2))
assert(pb_check_alignment(desc->alignment, 1u << mm->align2));
if(!pb_check_alignment(desc->alignment, 1u << mm->align2))
return NULL;
mtx_lock(&mm->mutex);

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, 1ull << buf->alignment_log2))
if (!pb_check_alignment(alignment, 1u << buf->alignment_log2))
return 0;
return mgr->can_reclaim(mgr->winsys, buf) ? 1 : -1;