From 33b9c7a7f68bb5a4362751ba7daf1ba2b10ece95 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Wed, 4 Sep 2019 13:52:13 +0300
Subject: intel/perf: break GL query stuff away
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This stuff is somewhat specific to the GL extension & drivers. On
Vulkan we won't use this, it also made a rather large file.

v2: Fix Android build (Lionel)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Mark Janes <mark.a.janes@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4344>
---
 src/gallium/drivers/iris/iris_perf.c              | 1 -
 src/gallium/drivers/iris/iris_perf.h              | 1 +
 src/gallium/drivers/iris/iris_performance_query.c | 3 ---
 src/gallium/drivers/iris/iris_query.c             | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/gallium/drivers/iris')

diff --git a/src/gallium/drivers/iris/iris_perf.c b/src/gallium/drivers/iris/iris_perf.c
index 784890e4728..ab1d32c1361 100644
--- a/src/gallium/drivers/iris/iris_perf.c
+++ b/src/gallium/drivers/iris/iris_perf.c
@@ -22,7 +22,6 @@
 
 #include "iris_perf.h"
 #include "iris_context.h"
-#include "perf/gen_perf_regs.h"
 
 static void *
 iris_oa_bo_alloc(void *bufmgr, const char *name, uint64_t size)
diff --git a/src/gallium/drivers/iris/iris_perf.h b/src/gallium/drivers/iris/iris_perf.h
index a6c132dfe9c..c1f7ea2072c 100644
--- a/src/gallium/drivers/iris/iris_perf.h
+++ b/src/gallium/drivers/iris/iris_perf.h
@@ -24,6 +24,7 @@
 #define IRIS_PERF_H
 
 #include "perf/gen_perf.h"
+#include "perf/gen_perf_query.h"
 
 void iris_perf_init_vtbl(struct gen_perf_config *cfg);
 
diff --git a/src/gallium/drivers/iris/iris_performance_query.c b/src/gallium/drivers/iris/iris_performance_query.c
index 2f990762315..825f4c44268 100644
--- a/src/gallium/drivers/iris/iris_performance_query.c
+++ b/src/gallium/drivers/iris/iris_performance_query.c
@@ -25,9 +25,6 @@
 #include "iris_context.h"
 #include "iris_perf.h"
 
-#include "perf/gen_perf.h"
-#include "perf/gen_perf_regs.h"
-
 struct iris_perf_query {
    struct gl_perf_query_object base;
    struct gen_perf_query_object *query;
diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c
index a6e062ded0f..b6481200bde 100644
--- a/src/gallium/drivers/iris/iris_query.c
+++ b/src/gallium/drivers/iris/iris_query.c
@@ -33,7 +33,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "perf/gen_perf.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
-- 
cgit v1.2.3