diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-22 15:31:15 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-22 15:31:15 +0100 |
commit | 7dc0001f3db58af82f7e34c83a9fdb5fe90baccd (patch) | |
tree | bbfc35f4c6ca4423f90752b3ee34755b57d1af47 /lib/rendercopy.h | |
parent | a8e8654f81380c19f7c90479f98b9d9314f638b3 (diff) |
lib: make rendercopy.h an internal header
And move the public interfaces into intel_batchbuffer.[hc].
A bit messy since we are fairly inconsistent with our header #include
handling.
Also exclude rendercopy.h from the documentation.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/rendercopy.h')
-rw-r--r-- | lib/rendercopy.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/lib/rendercopy.h b/lib/rendercopy.h index 6312cc327..92691fcf7 100644 --- a/lib/rendercopy.h +++ b/lib/rendercopy.h @@ -1,34 +1,3 @@ -#ifndef RENDERCOPY_H -#define RENDERCOPY_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" - -struct scratch_buf { - drm_intel_bo *bo; - uint32_t stride; - uint32_t tiling; - uint32_t *data; - uint32_t *cpu_mapping; - uint32_t size; - unsigned num_tiles; -}; - static inline void emit_vertex_2s(struct intel_batchbuffer *batch, int16_t x, int16_t y) { @@ -51,24 +20,6 @@ static inline void emit_vertex_normalized(struct intel_batchbuffer *batch, OUT_BATCH(u.ui); } -static inline unsigned buf_width(struct scratch_buf *buf) -{ - return buf->stride/sizeof(uint32_t); -} - -static inline unsigned buf_height(struct scratch_buf *buf) -{ - return buf->size/buf->stride; -} - -typedef void (*render_copyfunc_t)(struct intel_batchbuffer *batch, - drm_intel_context *context, - struct scratch_buf *src, unsigned src_x, unsigned src_y, - unsigned width, unsigned height, - struct scratch_buf *dst, unsigned dst_x, unsigned dst_y); - -render_copyfunc_t get_render_copyfunc(int devid); - void gen8_render_copyfunc(struct intel_batchbuffer *batch, drm_intel_context *context, struct scratch_buf *src, unsigned src_x, unsigned src_y, @@ -94,5 +45,3 @@ void gen2_render_copyfunc(struct intel_batchbuffer *batch, struct scratch_buf *src, unsigned src_x, unsigned src_y, unsigned width, unsigned height, struct scratch_buf *dst, unsigned dst_x, unsigned dst_y); - -#endif /* RENDERCOPY_H */ |