Module: Mesa
Branch: staging/20.0
Commit: 57e746cfc04f95d89ad2d8b757eb1d02a44bb264
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=57e746cfc04f95d89ad2d8b757eb1d02a44bb264

Author: John Stultz <[email protected]>
Date:   Thu Mar 12 21:21:50 2020 +0000

vc4_bufmgr: Remove duplicative VC definition

This is already defined in
  src/broadcom/cle/v3d_packet_helpers.h:42:9

And was causing build issues in AOSP when building with mmma

Reviewed-by: Eric Anholt <[email protected]>
Signed-off-by: John Stultz <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4175>
(cherry picked from commit 0df48e5d1f09c81bdbc9cc501c5a382c9175da33)
Signed-off-by: John Stultz <[email protected]>

---

 src/gallium/drivers/vc4/vc4_bufmgr.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c 
b/src/gallium/drivers/vc4/vc4_bufmgr.c
index 5ec360934c0..206b1e98ff3 100644
--- a/src/gallium/drivers/vc4/vc4_bufmgr.c
+++ b/src/gallium/drivers/vc4/vc4_bufmgr.c
@@ -36,14 +36,6 @@
 #include "vc4_context.h"
 #include "vc4_screen.h"
 
-#ifdef HAVE_VALGRIND
-#include <valgrind.h>
-#include <memcheck.h>
-#define VG(x) x
-#else
-#define VG(x)
-#endif
-
 static bool dump_stats = false;
 
 static void

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to