Mesa (master): anv/allocator: Only write to _vg_ptr if we have valgrind

Jason Ekstrand jekstrand at kemper.freedesktop.org
Fri May 5 19:50:15 UTC 2017


Module: Mesa
Branch: master
Commit: e05e3e07ab47a8108b8a8d257d7e8acc1f7cf584
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e05e3e07ab47a8108b8a8d257d7e8acc1f7cf584

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri May  5 12:11:42 2017 -0700

anv/allocator: Only write to _vg_ptr if we have valgrind

This fixes the build when not building against valgrind headers.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100945
Reviewed-by: Chad Versace <chadversary at chromium.org>

---

 src/intel/vulkan/anv_allocator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index e2f2dea569..b767542aa5 100644
--- a/src/intel/vulkan/anv_allocator.c
+++ b/src/intel/vulkan/anv_allocator.c
@@ -927,7 +927,7 @@ anv_state_stream_alloc(struct anv_state_stream *stream,
       VG_NOACCESS_WRITE(&sb->block, stream->block);
       VG_NOACCESS_WRITE(&sb->next, stream->block_list);
       stream->block_list = sb;
-      VG_NOACCESS_WRITE(&sb->_vg_ptr, NULL);
+      VG(VG_NOACCESS_WRITE(&sb->_vg_ptr, NULL));
 
       VG(VALGRIND_MAKE_MEM_NOACCESS(stream->block.map, stream->block_size));
 




More information about the mesa-commit mailing list