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

radeonsi/gfx9: fix si_get_buffer_from_descriptors for 48-bit pointers

Browse source 
This fixes:
GL45-CTS.pipeline_statistics_query_tests_ARB.functional_compute_shader_invocations

Cc: 18.0 18.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
(cherry picked from commit 6d671078a8)
This commit is contained in:
Marek Olšák 2018-06-01 19:29:45 -04:00 • committed by Dylan Baker
parent b274062906
commit 66bc41a3f7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -94,7 +94,7 @@ static uint32_t null_image_descriptor[8] = {
* descriptor */
};
static uint64_t si_desc_extract_buffer_address(uint32_t *desc)
static uint64_t si_desc_extract_buffer_address(const uint32_t *desc)
{
uint64_t va = desc[0] |
((uint64_t)G_008F04_BASE_ADDRESS_HI(desc[1]) << 32);
@ -1054,7 +1054,7 @@ static void si_get_buffer_from_descriptors(struct si_buffer_resources *buffers,
*size = desc[2];
assert(G_008F04_STRIDE(desc[1]) == 0);
va = ((uint64_t)desc[1] << 32) | desc[0];
va = si_desc_extract_buffer_address(desc);
assert(va >= res->gpu_address && va + *size <= res->gpu_address + res->bo_size);
*offset = va - res->gpu_address;