fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 09:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Align atomic values.

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22121>
This commit is contained in:
Bas Nieuwenhuizen 2023-03-26 00:42:10 +01:00 • committed by Marge Bot
parent 02c46fa1e8
commit a8cb837703
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/amd/vulkan/radv_query.c
View file

@ -1224,7 +1224,7 @@ radv_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t first
case VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR:
case VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SERIALIZATION_BOTTOM_LEVEL_POINTERS_KHR:
case VK_QUERY_TYPE_ACCELERATION_STRUCTURE_SIZE_KHR: {
uint64_t const *src64 = (uint64_t const *)src;
p_atomic_uint64_t const *src64 = (p_atomic_uint64_t const *)src;
uint64_t value;
do {
@ -1248,7 +1248,7 @@ radv_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t first
break;
}
case VK_QUERY_TYPE_OCCLUSION: {
uint64_t const *src64 = (uint64_t const *)src;
p_atomic_uint64_t const *src64 = (p_atomic_uint64_t const *)src;
uint32_t db_count = device->physical_device->rad_info.max_render_backends;
uint64_t enabled_rb_mask = device->physical_device->rad_info.enabled_rb_mask;
uint64_t sample_count = 0;
@ -1349,7 +1349,7 @@ radv_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t first
break;
}
case VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT: {
uint64_t const *src64 = (uint64_t const *)src;
p_atomic_uint64_t const *src64 = (p_atomic_uint64_t const *)src;
uint64_t num_primitives_written;
uint64_t primitive_storage_needed;
@ -1389,7 +1389,7 @@ radv_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t first
break;
}
case VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT: {
uint64_t const *src64 = (uint64_t const *)src;
p_atomic_uint64_t const *src64 = (p_atomic_uint64_t const *)src;
uint64_t primitive_storage_needed;
/* SAMPLE_STREAMOUTSTATS stores this structure:
@ -1429,7 +1429,7 @@ radv_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t first
}
case VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR: {
struct radv_pc_query_pool *pc_pool = (struct radv_pc_query_pool *)pool;
const uint64_t *src64 = (const uint64_t *)src;
const p_atomic_uint64_t *src64 = (const p_atomic_uint64_t *)src;
bool avail;
do {
avail = true;

6
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
View file

@ -52,9 +52,9 @@ struct radv_amdgpu_winsys {
bool reserve_vmid;
uint64_t perftest;
uint64_t allocated_vram;
uint64_t allocated_vram_vis;
uint64_t allocated_gtt;
p_atomic_uint64_t allocated_vram;
p_atomic_uint64_t allocated_vram_vis;
p_atomic_uint64_t allocated_gtt;
/* Global BO list */
struct {