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

mesa: execute an error path sooner in _mesa_validated_drawrangeelements

Browse source 
Also don't print the warning in release builds.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26619>
This commit is contained in:
Marek Olšák 2023-12-07 16:17:18 -05:00 • committed by Marge Bot
parent 4f766426b2
commit 7f11272d29
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mesa/main/draw.c
View file

@ -1623,8 +1623,21 @@ _mesa_validated_drawrangeelements(struct gl_context *ctx,
struct pipe_draw_start_count_bias draw;
unsigned index_size_shift = get_index_size_shift(type);
if (index_bo && !indices_aligned(index_size_shift, indices))
return;
if (index_bo) {
if (!indices_aligned(index_size_shift, indices))
return;
if (unlikely(index_bo->Size < (uintptr_t)indices || !index_bo->buffer)) {
#ifndef NDEBUG
_mesa_warning(ctx, "Invalid indices offset 0x%" PRIxPTR
" (indices buffer size is %ld bytes)"
" or unallocated buffer (%u). Draw skipped.",
(uintptr_t)indices, (long)index_bo->Size,
!!index_bo->buffer);
#endif
return;
}
}
info.mode = mode;
info.index_size = 1 << index_size_shift;
@ -1646,16 +1659,7 @@ _mesa_validated_drawrangeelements(struct gl_context *ctx,
info.index.user = indices;
draw.start = 0;
} else {
uintptr_t start = (uintptr_t) indices;
if (unlikely(index_bo->Size < start || !index_bo->buffer)) {
_mesa_warning(ctx, "Invalid indices offset 0x%" PRIxPTR
" (indices buffer size is %ld bytes)"
" or unallocated buffer (%u). Draw skipped.",
start, (long)index_bo->Size, !!index_bo->buffer);
return;
}
draw.start = start >> index_size_shift;
draw.start = (uintptr_t)indices >> index_size_shift;
if (ctx->st->pipe->draw_vbo == tc_draw_vbo) {
/* Fast path for u_threaded_context to eliminate atomics. */