From: Marek Olšák <marek.ol...@amd.com>
---
src/gallium/drivers/radeon/Makefile.sources | 2 --
src/gallium/drivers/radeon/r600_gpu_load.c | 2 +-
src/gallium/drivers/radeon/r600_perfcounter.c | 2 +-
src/gallium/drivers/radeon/r600_pipe_common.h | 6 ------
src/gallium/drivers/radeon/r600_texture.c | 2 +-
src/gallium/drivers/radeonsi/Makefile.sources | 2 ++
src/gallium/drivers/radeonsi/si_perfcounter.c | 2 +-
src/gallium/drivers/radeonsi/si_pipe.h | 6 ++++++
src/gallium/drivers/{radeon/r600_query.c => radeonsi/si_query.c} | 4 ++--
src/gallium/drivers/{radeon/r600_query.h => radeonsi/si_query.h} | 0
src/gallium/drivers/radeonsi/si_state.c | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
rename src/gallium/drivers/{radeon/r600_query.c => radeonsi/si_query.c} (99%)
rename src/gallium/drivers/{radeon/r600_query.h => radeonsi/si_query.h} (100%)
diff --git a/src/gallium/drivers/radeon/Makefile.sources
b/src/gallium/drivers/radeon/Makefile.sources
index 8c355ef..789a347 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -3,8 +3,6 @@ C_SOURCES := \
r600_gpu_load.c \
r600_perfcounter.c \
r600_pipe_common.h \
- r600_query.c \
- r600_query.h \
r600_texture.c \
radeon_uvd.c \
radeon_uvd.h \
diff --git a/src/gallium/drivers/radeon/r600_gpu_load.c
b/src/gallium/drivers/radeon/r600_gpu_load.c
index 660ac1d..8c457b3 100644
--- a/src/gallium/drivers/radeon/r600_gpu_load.c
+++ b/src/gallium/drivers/radeon/r600_gpu_load.c
@@ -33,7 +33,7 @@
*/
#include "radeonsi/si_pipe.h"
-#include "r600_query.h"
+#include "radeonsi/si_query.h"
#include "util/os_time.h"
/* For good accuracy at 1000 fps or lower. This will be inaccurate for higher
diff --git a/src/gallium/drivers/radeon/r600_perfcounter.c
b/src/gallium/drivers/radeon/r600_perfcounter.c
index c5b55cd..57c3246 100644
--- a/src/gallium/drivers/radeon/r600_perfcounter.c
+++ b/src/gallium/drivers/radeon/r600_perfcounter.c
@@ -23,7 +23,7 @@
*/
#include "util/u_memory.h"
-#include "r600_query.h"
+#include "radeonsi/si_query.h"
#include "radeonsi/si_pipe.h"
#include "amd/common/sid.h"
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h
b/src/gallium/drivers/radeon/r600_pipe_common.h
index fd94211..1e0bf76 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -434,12 +434,6 @@ unsigned si_end_counter(struct si_screen *sscreen,
unsigned type,
/* r600_perfcounters.c */
void si_perfcounters_destroy(struct si_screen *sscreen);
-/* r600_query.c */
-void si_init_screen_query_functions(struct si_screen *sscreen);
-void si_init_query_functions(struct si_context *sctx);
-void si_suspend_queries(struct si_context *sctx);
-void si_resume_queries(struct si_context *sctx);
-
/* r600_texture.c */
bool si_prepare_for_dma_blit(struct si_context *sctx,
struct r600_texture *rdst,
diff --git a/src/gallium/drivers/radeon/r600_texture.c
b/src/gallium/drivers/radeon/r600_texture.c
index a476164..c1c4315 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -24,7 +24,7 @@
*/
#include "radeonsi/si_pipe.h"
-#include "r600_query.h"
+#include "radeonsi/si_query.h"
#include "util/u_format.h"
#include "util/u_log.h"
#include "util/u_memory.h"
diff --git a/src/gallium/drivers/radeonsi/Makefile.sources
b/src/gallium/drivers/radeonsi/Makefile.sources
index be9c171..4182b8a 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -23,6 +23,8 @@ C_SOURCES := \
si_pm4.h \
si_perfcounter.c \
si_public.h \
+ si_query.c \
+ si_query.h \
si_shader.c \
si_shader.h \
si_shader_internal.h \
diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c
b/src/gallium/drivers/radeonsi/si_perfcounter.c
index 0593d55..7ab995c 100644
--- a/src/gallium/drivers/radeonsi/si_perfcounter.c
+++ b/src/gallium/drivers/radeonsi/si_perfcounter.c
@@ -23,7 +23,7 @@
*/
#include "si_build_pm4.h"
-#include "radeon/r600_query.h"
+#include "si_query.h"
#include "util/u_memory.h"
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h
b/src/gallium/drivers/radeonsi/si_pipe.h
index 35a7cf3..00a5f84 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -837,6 +837,12 @@ void si_init_perfcounters(struct si_screen *screen);
/* si_pipe.c */
bool si_check_device_reset(struct si_context *sctx);
+/* si_query.c */
+void si_init_screen_query_functions(struct si_screen *sscreen);
+void si_init_query_functions(struct si_context *sctx);
+void si_suspend_queries(struct si_context *sctx);
+void si_resume_queries(struct si_context *sctx);
+
/* si_test_dma.c */
void si_test_dma(struct si_screen *sscreen);
diff --git a/src/gallium/drivers/radeon/r600_query.c
b/src/gallium/drivers/radeonsi/si_query.c
similarity index 99%
rename from src/gallium/drivers/radeon/r600_query.c
rename to src/gallium/drivers/radeonsi/si_query.c
index 171f483..67c323a 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeonsi/si_query.c
@@ -24,8 +24,8 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "radeonsi/si_pipe.h"
-#include "r600_query.h"
+#include "si_pipe.h"
+#include "si_query.h"
#include "util/u_memory.h"
#include "util/u_upload_mgr.h"
#include "util/os_time.h"
diff --git a/src/gallium/drivers/radeon/r600_query.h
b/src/gallium/drivers/radeonsi/si_query.h
similarity index 100%
rename from src/gallium/drivers/radeon/r600_query.h
rename to src/gallium/drivers/radeonsi/si_query.h
diff --git a/src/gallium/drivers/radeonsi/si_state.c
b/src/gallium/drivers/radeonsi/si_state.c
index 3136cba..b7a9a61 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -24,7 +24,7 @@
#include "si_build_pm4.h"
#include "gfx9d.h"
-#include "radeon/r600_query.h"
+#include "si_query.h"
#include "util/u_dual_blend.h"
#include "util/u_format.h"
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
