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

radeonsi: cosmetic changes for queries

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37849>
This commit is contained in:
Marek Olšák 2025-10-12 23:27:36 -04:00 • committed by Marge Bot
parent 6651781731
commit 02db1fbe82
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/drivers/radeonsi/gfx11_query.c
View file

@ -53,6 +53,7 @@ static bool gfx11_alloc_query_buffer(struct si_context *sctx)
return true;
struct gfx11_sh_query_buffer *qbuf = NULL;
struct pipe_shader_buffer sbuf;
if (!list_is_empty(&sctx->shader_query_buffers)) {
qbuf = list_last_entry(&sctx->shader_query_buffers, struct gfx11_sh_query_buffer, list);
@ -95,7 +96,7 @@ static bool gfx11_alloc_query_buffer(struct si_context *sctx)
for (unsigned i = 0, e = qbuf->buf->b.b.width0 / sizeof(struct gfx11_sh_query_buffer_mem); i < e;
++i) {
for (unsigned j = 0; j < 16; ++j)
results[32 * i + j] = (uint64_t)1 << 63;
results[32 * i + j] = BITFIELD64_BIT(63);
results[32 * i + 16] = 0;
}
@ -103,8 +104,7 @@ static bool gfx11_alloc_query_buffer(struct si_context *sctx)
qbuf->head = 0;
qbuf->refcount = sctx->streamout.num_ngg_queries;
success:;
struct pipe_shader_buffer sbuf;
success:
sbuf.buffer = &qbuf->buf->b.b;
sbuf.buffer_offset = qbuf->head;
sbuf.buffer_size = sizeof(struct gfx11_sh_query_buffer_mem);
@ -180,20 +180,18 @@ static void gfx11_sh_query_add_result(struct gfx11_sh_query *query,
struct gfx11_sh_query_buffer_mem *qmem,
union pipe_query_result *result)
{
static const uint64_t mask = ((uint64_t)1 << 63) - 1;
switch (query->b.type) {
case PIPE_QUERY_PRIMITIVES_EMITTED:
result->u64 += qmem->stream[query->stream].emitted_primitives & mask;
result->u64 += qmem->stream[query->stream].emitted_primitives & ~BITFIELD64_BIT(63);
break;
case PIPE_QUERY_PRIMITIVES_GENERATED:
result->u64 += qmem->stream[query->stream].generated_primitives & mask;
result->u64 += qmem->stream[query->stream].generated_primitives & ~BITFIELD64_BIT(63);
break;
case PIPE_QUERY_SO_STATISTICS:
result->so_statistics.num_primitives_written +=
qmem->stream[query->stream].emitted_primitives & mask;
qmem->stream[query->stream].emitted_primitives & ~BITFIELD64_BIT(63);
result->so_statistics.primitives_storage_needed +=
qmem->stream[query->stream].generated_primitives & mask;
qmem->stream[query->stream].generated_primitives & ~BITFIELD64_BIT(63);
break;
case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
result->b |= qmem->stream[query->stream].emitted_primitives !=

2
src/gallium/drivers/radeonsi/si_query.c
View file

@ -1334,7 +1334,7 @@ static uint64_t si_query_read_result(void *map, unsigned start_index, unsigned e
start = (uint64_t)current_result[start_index] | (uint64_t)current_result[start_index + 1] << 32;
end = (uint64_t)current_result[end_index] | (uint64_t)current_result[end_index + 1] << 32;
if (!test_status_bit || ((start & 0x8000000000000000UL) && (end & 0x8000000000000000UL))) {
if (!test_status_bit || ((start & BITFIELD64_BIT(63)) && (end & BITFIELD64_BIT(63)))) {
return end - start;
}
return 0;