AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pvr: Add missing valgrind includes and fix unused return value.

Browse Source 
On including the header the compiler started throwing warnings
about the return value not being used when setting and getting the
vbits.

This commit adds the missing valgrind related headers and fixes the
warnings caused by including them.

Signed-off-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Reviewed-by: Matt Coster <matt.coster@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20035>
This commit is contained in:
Karmjit Mahil
2022-10-18 16:10:43 +01:00
committed by Marge Bot
parent 8d3475ab8c
commit 09eb2a4023
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/imagination/vulkan/pvr_bo.c
+20 -7
View File
@@ -28,6 +28,11 @@
#include <stdio.h>
#include <vulkan/vulkan.h>
#if defined(HAVE_VALGRIND)
# include <valgrind.h>
# include <memcheck.h>
#endif
#include "pvr_bo.h"
#include "pvr_debug.h"
#include "pvr_dump.h"
@@ -443,10 +448,13 @@ void pvr_bo_cpu_unmap(struct pvr_device *device, struct pvr_bo *pvr_bo)
bo->size,
8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (bo->vbits)
VALGRIND_GET_VBITS(bo->map, bo->vbits, bo->size);
else
if (bo->vbits) {
unsigned ret = VALGRIND_GET_VBITS(bo->map, bo->vbits, bo->size);
if (ret != 0 && ret != 1)
mesa_loge("Failed to get vbits; expect bad valgrind results.");
} else {
mesa_loge("Failed to alloc vbits storage; expect bad valgrind results.");
}
#endif /* defined(HAVE_VALGRIND) */
device->ws->ops->buffer_unmap(bo);
@@ -485,10 +493,15 @@ void pvr_bo_free(struct pvr_device *device, struct pvr_bo *pvr_bo)
#if defined(HAVE_VALGRIND)
void *pvr_bo_cpu_map_unchanged(struct pvr_device *device, struct pvr_bo *pvr_bo)
{
void *ret = pvr_bo_cpu_map(device, pvr_bo);
if (ret)
VALGRIND_SET_VBITS(pvr_bo->bo->map, pvr_bo->bo->vbits, pvr_bo->bo->size);
void *map = pvr_bo_cpu_map(device, pvr_bo);
if (map) {
unsigned ret = VALGRIND_SET_VBITS(pvr_bo->bo->map,
pvr_bo->bo->vbits,
pvr_bo->bo->size);
if (ret != 0 && ret != 1)
mesa_loge("Failed to set vbits; expect bad valgrind results.");
}
return ret;
return map;
}
#endif /* defined(HAVE_VALGRIND) */