diff options
author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2020-05-29 12:41:27 +0200 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-06-01 12:55:40 +0100 |
commit | 587cbed206689abbad60689d4a32bf9caf0cc124 (patch) | |
tree | e980cb8e8a2d60bea27744e2eab227cae3dd96cb /lib/intel_batchbuffer.h | |
parent | 3730d63a4ea89c2ca10073825d26b555816475dc (diff) |
tests/gem_(gpgpu|media)_fill: remove the _v2 suffix
Remove libdrm functions and replace them with new ones after removing
_v2 suffix introduced for transition state.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/intel_batchbuffer.h')
-rw-r--r-- | lib/intel_batchbuffer.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h index 162e7f0c..ae052c17 100644 --- a/lib/intel_batchbuffer.h +++ b/lib/intel_batchbuffer.h @@ -370,8 +370,8 @@ igt_vebox_copyfunc_t igt_get_vebox_copyfunc(int devid); /** * igt_fillfunc_t: - * @batch: batchbuffer object - * @dst: destination i-g-t buffer object + * @i915: drm fd + * @buf: destination intel_buf object * @x: destination pixel x-coordination * @y: destination pixel y-coordination * @width: width of the filled rectangle @@ -385,23 +385,15 @@ igt_vebox_copyfunc_t igt_get_vebox_copyfunc(int devid); * A fill function will emit a batchbuffer to the kernel which executes * the specified blit fill operation using the media/gpgpu engine. */ -typedef void (*igt_fillfunc_t)(struct intel_batchbuffer *batch, - const struct igt_buf *dst, +struct intel_buf; +typedef void (*igt_fillfunc_t)(int i915, + struct intel_buf *buf, unsigned x, unsigned y, unsigned width, unsigned height, uint8_t color); -struct intel_buf; -typedef void (*igt_fillfunc_v2_t)(int i915, - struct intel_buf *buf, - unsigned x, unsigned y, - unsigned width, unsigned height, - uint8_t color); - -igt_fillfunc_t igt_get_media_fillfunc(int devid); igt_fillfunc_t igt_get_gpgpu_fillfunc(int devid); -igt_fillfunc_v2_t igt_get_gpgpu_fillfunc_v2(int devid); -igt_fillfunc_v2_t igt_get_media_fillfunc_v2(int devid); +igt_fillfunc_t igt_get_media_fillfunc(int devid); typedef void (*igt_vme_func_t)(int i915, uint32_t ctx, |