diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-22 15:35:16 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-22 15:39:29 +0100 |
commit | aaebbc513a2f1fd94e9db5fc2841c2bd617e3472 (patch) | |
tree | 18061926b80258fc6ac5cd20e84d9620ea9ae654 /lib | |
parent | 7dc0001f3db58af82f7e34c83a9fdb5fe90baccd (diff) |
lib: make media_fill.h an internal header
Same deal as with rendercopy.h.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile.sources | 1 | ||||
-rw-r--r-- | lib/intel_batchbuffer.c | 13 | ||||
-rw-r--r-- | lib/intel_batchbuffer.h | 8 | ||||
-rw-r--r-- | lib/media_fill.c | 14 | ||||
-rw-r--r-- | lib/media_fill.h | 8 |
5 files changed, 21 insertions, 23 deletions
diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 2b700c6c..e6ada3c9 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -22,7 +22,6 @@ libintel_tools_la_SOURCES = \ intel_reg.h \ ioctl_wrappers.c \ ioctl_wrappers.h \ - media_fill.c \ media_fill.h \ media_fill_gen7.c \ media_fill_gen8.c \ diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index df036013..29740bd9 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -38,6 +38,7 @@ #include "intel_chipset.h" #include "intel_reg.h" #include "rendercopy.h" +#include "media_fill.h" #include <i915_drm.h> /** @@ -403,3 +404,15 @@ render_copyfunc_t get_render_copyfunc(int devid) return copy; } + +media_fillfunc_t get_media_fillfunc(int devid) +{ + media_fillfunc_t fill = NULL; + + if (IS_GEN8(devid)) + fill = gen8_media_fillfunc; + else if (IS_GEN7(devid)) + fill = gen7_media_fillfunc; + + return fill; +} diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h index 5e02269c..4b183122 100644 --- a/lib/intel_batchbuffer.h +++ b/lib/intel_batchbuffer.h @@ -224,4 +224,12 @@ typedef void (*render_copyfunc_t)(struct intel_batchbuffer *batch, render_copyfunc_t get_render_copyfunc(int devid); +typedef void (*media_fillfunc_t)(struct intel_batchbuffer *batch, + struct scratch_buf *dst, + unsigned x, unsigned y, + unsigned width, unsigned height, + uint8_t color); + +media_fillfunc_t get_media_fillfunc(int devid); + #endif diff --git a/lib/media_fill.c b/lib/media_fill.c deleted file mode 100644 index 084237f7..00000000 --- a/lib/media_fill.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "i830_reg.h" -#include "media_fill.h" - -media_fillfunc_t get_media_fillfunc(int devid) -{ - media_fillfunc_t fill = NULL; - - if (IS_GEN8(devid)) - fill = gen8_media_fillfunc; - else if (IS_GEN7(devid)) - fill = gen7_media_fillfunc; - - return fill; -} diff --git a/lib/media_fill.h b/lib/media_fill.h index 9115776a..4b2fd3a4 100644 --- a/lib/media_fill.h +++ b/lib/media_fill.h @@ -19,14 +19,6 @@ #include "intel_batchbuffer.h" #include "intel_gpu_tools.h" -typedef void (*media_fillfunc_t)(struct intel_batchbuffer *batch, - struct scratch_buf *dst, - unsigned x, unsigned y, - unsigned width, unsigned height, - uint8_t color); - -media_fillfunc_t get_media_fillfunc(int devid); - void gen8_media_fillfunc(struct intel_batchbuffer *batch, struct scratch_buf *dst, |