summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-10-22 17:38:44 +0200
committerNicolai Hähnle <[email protected]>2017-11-09 11:57:21 +0100
commit222a2fb99859f3ac237def59d40413bb1a464f11 (patch)
treee29bdd5a50afc58290496c87cf1541f1cc5426f4 /src/gallium/drivers/r600
parentf76a6cb337f979fb26d3233d7e0ff208ec8885bb (diff)
util: move os_time.[ch] to src/util
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
-rw-r--r--src/gallium/drivers/r600/r600_gpu_load.c2
-rw-r--r--src/gallium/drivers/r600/r600_pipe.c2
-rw-r--r--src/gallium/drivers/r600/r600_pipe_common.c2
-rw-r--r--src/gallium/drivers/r600/r600_query.c2
-rw-r--r--src/gallium/drivers/r600/r600_texture.c2
-rw-r--r--src/gallium/drivers/r600/sb/sb_core.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_gpu_load.c b/src/gallium/drivers/r600/r600_gpu_load.c
index c15fb9dfa06..a2de8cc71a4 100644
--- a/src/gallium/drivers/r600/r600_gpu_load.c
+++ b/src/gallium/drivers/r600/r600_gpu_load.c
@@ -36,7 +36,7 @@
#include "r600_pipe_common.h"
#include "r600_query.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
/* For good accuracy at 1000 fps or lower. This will be inaccurate for higher
* fps (there are too few samples per frame). */
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index e639d928830..2381c5b7d00 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -39,7 +39,7 @@
#include "vl/vl_video_buffer.h"
#include "radeon_video.h"
#include "radeon_uvd.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
static const struct debug_named_value r600_debug_options[] = {
/* features */
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index acad670d6fa..e2d0e32bb2b 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -32,7 +32,7 @@
#include "util/u_memory.h"
#include "util/u_format_s3tc.h"
#include "util/u_upload_mgr.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
#include "vl/vl_decoder.h"
#include "vl/vl_video_buffer.h"
#include "radeon_video.h"
diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index aa3e36f56f7..9c17c3ba23e 100644
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -27,7 +27,7 @@
#include "r600_cs.h"
#include "util/u_memory.h"
#include "util/u_upload_mgr.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
#include "tgsi/tgsi_text.h"
#define R600_MAX_STREAMS 4
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index b8411144900..3515d979d9e 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -32,7 +32,7 @@
#include "util/u_memory.h"
#include "util/u_pack_color.h"
#include "util/u_surface.h"
-#include "os/os_time.h"
+#include "util/os_time.h"
#include <errno.h>
#include <inttypes.h>
diff --git a/src/gallium/drivers/r600/sb/sb_core.cpp b/src/gallium/drivers/r600/sb/sb_core.cpp
index afea8188f1c..cdc2862d36d 100644
--- a/src/gallium/drivers/r600/sb/sb_core.cpp
+++ b/src/gallium/drivers/r600/sb/sb_core.cpp
@@ -26,7 +26,7 @@
#define SB_RA_SCHED_CHECK DEBUG
-#include "os/os_time.h"
+#include "util/os_time.h"
#include "r600_pipe.h"
#include "r600_shader.h"