[igt-dev] [PATCH i-g-t v2 5/5] lib: Rename library from gpu_fill to gpu_helpers

[Katarzyna Dec]

After refactoring media_spin library - gpu_fill contains helper
functions for render copy, *_fill functions and media_spin.
Let's rename this library to gpu_helpers. This name will be more
general.

Signed-off-by: Katarzyna Dec <katarzyna.dec at intel.com>
Cc: Lukasz Kalamarz <lukasz.kalamarz at intel.com>
Cc: Antonio Argenziano <antonio.argenziano at intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
---
 lib/Makefile.sources              | 4 ++--
 lib/gpgpu_fill.c                  | 2 +-
 lib/{gpu_fill.c => gpu_helpers.c} | 2 +-
 lib/{gpu_fill.h => gpu_helpers.h} | 6 +++---
 lib/media_fill_gen7.c             | 2 +-
 lib/media_fill_gen8.c             | 2 +-
 lib/media_fill_gen9.c             | 2 +-
 lib/media_spin.c                  | 2 +-
 lib/meson.build                   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename lib/{gpu_fill.c => gpu_helpers.c} (99%)
 rename lib/{gpu_fill.h => gpu_helpers.h} (98%)

diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index 9c0150c1..2b642277 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -63,8 +63,8 @@ lib_source_list =	 	\
 	media_spin.c		\
 	gpgpu_fill.h		\
 	gpgpu_fill.c		\
-	gpu_fill.h		\
-	gpu_fill.c		\
+	gpu_helpers.h		\
+	gpu_helpers.c		\
 	gen7_media.h            \
 	gen8_media.h            \
 	rendercopy_i915.c	\
diff --git a/lib/gpgpu_fill.c b/lib/gpgpu_fill.c
index 3b89dd1b..820fc7d4 100644
--- a/lib/gpgpu_fill.c
+++ b/lib/gpgpu_fill.c
@@ -32,7 +32,7 @@
 #include "drmtest.h"
 
 #include "gpgpu_fill.h"
-#include "gpu_fill.h"
+#include "gpu_helpers.h"
 
 /* shaders/gpgpu/gpgpu_fill.gxa */
 static const uint32_t gen7_gpgpu_kernel[][4] = {
diff --git a/lib/gpu_fill.c b/lib/gpu_helpers.c
similarity index 99%
rename from lib/gpu_fill.c
rename to lib/gpu_helpers.c
index 57b95840..650a3859 100644
--- a/lib/gpu_fill.c
+++ b/lib/gpu_helpers.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "gpu_fill.h"
+#include "gpu_helpers.h"
 
 void
 gen7_render_flush(struct intel_batchbuffer *batch, uint32_t batch_end)
diff --git a/lib/gpu_fill.h b/lib/gpu_helpers.h
similarity index 98%
rename from lib/gpu_fill.h
rename to lib/gpu_helpers.h
index 3a800198..62320293 100644
--- a/lib/gpu_fill.h
+++ b/lib/gpu_helpers.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef GPU_FILL_H
-#define GPU_FILL_H
+#ifndef GPU_HELPERS_H
+#define GPU_HELPERS_H
 
 #include <intel_bufmgr.h>
 #include <i915_drm.h>
@@ -126,4 +126,4 @@ gen_emit_media_object(struct intel_batchbuffer *batch, unsigned int xoffset,
 void
 gen9_emit_state_base_address(struct intel_batchbuffer *batch);
 
-#endif /* GPU_FILL_H */
+#endif /* GPU_HELPERS_H */
diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c
index 02dff04b..3c2c218a 100644
--- a/lib/media_fill_gen7.c
+++ b/lib/media_fill_gen7.c
@@ -5,7 +5,7 @@
 #include "gen7_media.h"
 #include "intel_reg.h"
 #include "drmtest.h"
-#include "gpu_fill.h"
+#include "gpu_helpers.h"
 #include <assert.h>
 
 static const uint32_t media_kernel[][4] = {
diff --git a/lib/media_fill_gen8.c b/lib/media_fill_gen8.c
index 3103b5e7..f9bec157 100644
--- a/lib/media_fill_gen8.c
+++ b/lib/media_fill_gen8.c
@@ -5,7 +5,7 @@
 #include "gen8_media.h"
 #include "intel_reg.h"
 #include "drmtest.h"
-#include "gpu_fill.h"
+#include "gpu_helpers.h"
 #include <assert.h>
 
 
diff --git a/lib/media_fill_gen9.c b/lib/media_fill_gen9.c
index d783d0bd..7c24b12b 100644
--- a/lib/media_fill_gen9.c
+++ b/lib/media_fill_gen9.c
@@ -4,7 +4,7 @@
 #include "media_fill.h"
 #include "gen8_media.h"
 #include "intel_reg.h"
-#include "gpu_fill.h"
+#include "gpu_helpers.h"
 #include <assert.h>
 
 static const uint32_t media_kernel[][4] = {
diff --git a/lib/media_spin.c b/lib/media_spin.c
index 2a8a6bdb..2e26088c 100644
--- a/lib/media_spin.c
+++ b/lib/media_spin.c
@@ -31,7 +31,7 @@
 #include "intel_batchbuffer.h"
 #include "gen8_media.h"
 #include "media_spin.h"
-#include "gpu_fill.h"
+#include "gpu_helpers.h"
 
 static const uint32_t spin_kernel[][4] = {
 	{ 0x00600001, 0x20800208, 0x008d0000, 0x00000000 }, /* mov (8)r4.0<1>:ud r0.0<8;8;1>:ud */
diff --git a/lib/meson.build b/lib/meson.build
index 5f2567fb..f5f60340 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -29,7 +29,7 @@ lib_sources = [
 	'media_fill_gen9.c',
 	'media_spin.c',
 	'gpgpu_fill.c',
-	'gpu_fill.c',
+	'gpu_helpers.c',
 	'rendercopy_i915.c',
 	'rendercopy_i830.c',
 	'rendercopy_gen6.c',
-- 
2.14.3