geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always define HAVE_VALGRIND 

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
main
Eric Engestrom 2018-01-26 15:08:39 +00:00
parent d2b0a4ec70
commit 1d7bbf8520
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -509,6 +509,8 @@ if test "x$VALGRIND" = "xyes"; then
AC_MSG_ERROR([Valgrind support required but not present]) AC_MSG_ERROR([Valgrind support required but not present])
fi fi
AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings]) AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings])
else
AC_DEFINE([HAVE_VALGRIND], 0)
fi fi
AC_MSG_RESULT([$VALGRIND]) AC_MSG_RESULT([$VALGRIND])

2
freedreno/freedreno_priv.h
View File

@ -200,7 +200,7 @@ offset_bytes(void *end, void *start)
return ((char *)end) - ((char *)start); return ((char *)end) - ((char *)start);
} }
#ifdef HAVE_VALGRIND #if HAVE_VALGRIND
# include <memcheck.h> # include <memcheck.h>
/* /*

4
intel/intel_bufmgr_gem.c
View File

@ -66,7 +66,7 @@
#include "i915_drm.h" #include "i915_drm.h"
#include "uthash.h" #include "uthash.h"
#ifdef HAVE_VALGRIND #if HAVE_VALGRIND
#include <valgrind.h> #include <valgrind.h>
#include <memcheck.h> #include <memcheck.h>
#define VG(x) x #define VG(x) x
@ -1629,7 +1629,7 @@ int
drm_intel_gem_bo_map_unsynchronized(drm_intel_bo *bo) drm_intel_gem_bo_map_unsynchronized(drm_intel_bo *bo)
{ {
drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr;
#ifdef HAVE_VALGRIND #if HAVE_VALGRIND
drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo; drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo;
#endif #endif
int ret; int ret;

5
meson.build
View File

@ -257,16 +257,13 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'],
[with_vc4, 'VC4'], [with_vc4, 'VC4'],
[with_freedreno_kgsl, 'FREEDRENO_KGSL'], [with_freedreno_kgsl, 'FREEDRENO_KGSL'],
[dep_cairo.found(), 'CAIRO'], [dep_cairo.found(), 'CAIRO'],
[dep_valgrind.found(), 'VALGRIND'],
[with_radeon, 'RADEON']] [with_radeon, 'RADEON']]
config.set10('HAVE_@0@'.format(t[1]), t[0]) config.set10('HAVE_@0@'.format(t[1]), t[0])
endforeach endforeach
if with_freedreno_kgsl and not with_freedreno if with_freedreno_kgsl and not with_freedreno
error('cannot enable freedreno-kgsl without freedreno support') error('cannot enable freedreno-kgsl without freedreno support')
endif endif
if dep_valgrind.found()
config.set10('HAVE_VALGRIND', true)
endif
config.set10('_GNU_SOURCE', true) config.set10('_GNU_SOURCE', true)
config_file = configure_file( config_file = configure_file(
configuration : config, configuration : config,