diff options
author | Imre Deak <imre.deak@intel.com> | 2013-05-24 17:26:54 +0300 |
---|---|---|
committer | Imre Deak <imre.deak@intel.com> | 2013-06-06 01:43:51 +0300 |
commit | f68d964c57c9229cad7321463e40f14b3974ec5d (patch) | |
tree | 61d35617b4e102b128d45d40468ca277a9af1b93 /lib/drmtest.h | |
parent | bfb0cdd668e6ecea56125586f5ddf1cf62cc0383 (diff) |
lib: refactor kmstest_create_fb
Factor out parts that will be used by an upcoming patch adding
kmstest_create_fb2.
Also call the fb paint functions directly, there is not much
point in passing a function pointer for that.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Diffstat (limited to 'lib/drmtest.h')
-rw-r--r-- | lib/drmtest.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/drmtest.h b/lib/drmtest.h index 89ded11c..218914ff 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -119,8 +119,13 @@ void kmstest_free_connector_config(struct kmstest_connector_config *config); struct kmstest_fb { uint32_t fb_id; uint32_t gem_handle; + uint32_t drm_format; + int width; + int height; + int depth; unsigned stride; unsigned size; + cairo_t *cairo_ctx; }; enum kmstest_text_align { @@ -136,14 +141,12 @@ int kmstest_cairo_printf_line(cairo_t *cr, enum kmstest_text_align align, double yspacing, const char *fmt, ...) __attribute__((format (printf, 4, 5))); -typedef void (*kmstest_paint_func)(cairo_t *cr, int width, int height, void *priv); - unsigned int kmstest_create_fb(int fd, int width, int height, int bpp, int depth, bool tiled, - struct kmstest_fb *fb_info, - kmstest_paint_func paint_func, - void *func_arg); -void kmstest_remove_fb(int fd, int fb_id); + struct kmstest_fb *fb_info); +void kmstest_remove_fb(int fd, struct kmstest_fb *fb_info); +cairo_t *kmstest_get_cairo_ctx(int fd, struct kmstest_fb *fb); +void kmstest_paint_test_pattern(cairo_t *cr, int width, int height); void kmstest_dump_mode(drmModeModeInfo *mode); int kmstest_get_pipe_from_crtc_id(int fd, int crtc_id); const char *kmstest_encoder_type_str(int type); |