diff options
-rw-r--r-- | lib/Makefile.sources | 4 | ||||
-rw-r--r-- | lib/gpgpu_fill.c | 2 | ||||
-rw-r--r-- | lib/gpu_cmds.c (renamed from lib/gpu_fill.c) | 2 | ||||
-rw-r--r-- | lib/gpu_cmds.h (renamed from lib/gpu_fill.h) | 6 | ||||
-rw-r--r-- | lib/media_fill_gen7.c | 2 | ||||
-rw-r--r-- | lib/media_fill_gen8.c | 2 | ||||
-rw-r--r-- | lib/media_fill_gen9.c | 2 | ||||
-rw-r--r-- | lib/media_spin.c | 2 | ||||
-rw-r--r-- | lib/meson.build | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 9c0150c1..c0c33206 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_cmds.h \ + gpu_cmds.c \ gen7_media.h \ gen8_media.h \ rendercopy_i915.c \ diff --git a/lib/gpgpu_fill.c b/lib/gpgpu_fill.c index 9a2598bc..56cab27f 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_cmds.h" /* shaders/gpgpu/gpgpu_fill.gxa */ static const uint32_t gen7_gpgpu_kernel[][4] = { diff --git a/lib/gpu_fill.c b/lib/gpu_cmds.c index 21791360..d02877f4 100644 --- a/lib/gpu_fill.c +++ b/lib/gpu_cmds.c @@ -22,7 +22,7 @@ * */ -#include "gpu_fill.h" +#include "gpu_cmds.h" void gen7_render_flush(struct intel_batchbuffer *batch, uint32_t batch_end) diff --git a/lib/gpu_fill.h b/lib/gpu_cmds.h index d41e6ddb..3d71494e 100644 --- a/lib/gpu_fill.h +++ b/lib/gpu_cmds.h @@ -22,8 +22,8 @@ * */ -#ifndef GPU_FILL_H -#define GPU_FILL_H +#ifndef GPU_CMDS_H +#define GPU_CMDS_H #include <intel_bufmgr.h> #include <i915_drm.h> @@ -127,4 +127,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_CMDS_H */ diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c index a38b8556..0301856f 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_cmds.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 fc89c7f0..a4b6f743 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_cmds.h" #include <assert.h> diff --git a/lib/media_fill_gen9.c b/lib/media_fill_gen9.c index 805e7576..cf510ad9 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_cmds.h" #include <assert.h> static const uint32_t media_kernel[][4] = { diff --git a/lib/media_spin.c b/lib/media_spin.c index c3a8d572..f3e68ef7 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_cmds.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 04d550fa..493874b3 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_cmds.c', 'rendercopy_i915.c', 'rendercopy_i830.c', 'rendercopy_gen6.c', |