lib: make media_fill.h an internal header

Same deal as with rendercopy.h.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-03-22 15:35:16 +01:00
parent 7dc0001f3d
commit aaebbc513a
7 changed files with 39 additions and 26 deletions

View File

@ -24,7 +24,6 @@
<xi:include href="xml/intel_batchbuffer.xml"/>
<xi:include href="xml/intel_chipset.xml"/>
<xi:include href="xml/intel_gpu_tools.xml"/>
<xi:include href="xml/media_fill.xml"/>
</chapter>
<index id="api-index-full">

View File

@ -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 \

View File

@ -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;
}

View File

@ -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

View File

@ -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;
}

View File

@ -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,

View File

@ -32,8 +32,24 @@
#include <stdbool.h>
#include <unistd.h>
#include "media_fill.h"
#include <assert.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <fcntl.h>
#include <inttypes.h>
#include <errno.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
#include "i915_drm.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
#define WIDTH 64
#define STRIDE (WIDTH)