intel-gpu-tools: remove testdisplay.h from kms_render.c
PATCH 1/1 intel-gpu-tools: remove testdisplay.h from kms_render.c
From: Tim Gore <[email protected]>
kms_render.c included testdisplay.h but did not need it. This was preventing it from building on Android due to the lack of a Glib port. So I have removed this #include and changed Android.mk so that kms_render is built if we have cairo.
Signed-off-by Tim Gore <[email protected]>
--- tests/Android.mk | 4 ++-- tests/kms_render.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
tests/Android.mk +2 -2
@@ -31,7 +31,6 @@ skip_tests_list := skip_tests_list += gem_seqno_wrap skip_tests_list += testdisplay # needs glib.h skip_tests_list += pm_rpm -skip_tests_list += kms_render # needs glib.h # set local compilation flags for IGT tests IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG
@@ -69,7 +68,8 @@ else gem_render_copy \ pm_lpsp \ kms_fence_pin_leak \ - kms_mmio_vs_cs_flip + kms_mmio_vs_cs_flip \ + kms_render IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0 endif
tests/kms_render.c +0 -1
@@ -31,7 +31,6 @@#include <sys/time.h> #include "drmtest.h" -#include "testdisplay.h" #include "intel_bufmgr.h" #include "intel_batchbuffer.h" #include "intel_io.h"
Signature · 1 line
1.9.2
Quoted 9 lines · On Tue, Jun 03, 2014 at 03:18:31PM +0100, [email protected] wrote:
From: Tim Gore <[email protected]>
kms_render.cincludedtestdisplay.hbut did not need it. This was preventing it from building on Android due to the lack of a Glib port. So I have removed this #include and changed Android.mk so thatkms_renderis built if we have cairo.Signed-off-by Tim Gore <[email protected]>
Both patches merged, thanks.
-Daniel
Quoted 46 lines
--- tests/Android.mk | 4 ++-- tests/kms_render.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)tests/Android.mk +2
-2@@ -31,7 +31,6 @@ skip_tests_list := skip_tests_list += gem_seqno_wrap skip_tests_list += testdisplay # needs glib.h skip_tests_list += pm_rpm -skip_tests_list += kms_render # needs glib.h # set local compilation flags for IGT tests IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG@@ -69,7 +68,8 @@ else gem_render_copy \ pm_lpsp \ kms_fence_pin_leak \ - kms_mmio_vs_cs_flip + kms_mmio_vs_cs_flip \ + kms_render IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0 endiftests/kms_render.c +0
-1@@ -31,7 +31,6 @@#include <sys/time.h> #include "drmtest.h" -#include "testdisplay.h" #include "intel_bufmgr.h" #include "intel_batchbuffer.h" #include "intel_io.h" Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch