diff options
| author | Younes Manton <[email protected]> | 2009-11-02 20:32:58 -0500 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2009-11-02 20:32:58 -0500 |
| commit | e60a8e4fcf2b4073a5fc2d9ec1de5a6ca6c7b9fe (patch) | |
| tree | 7b703c5e05ed7faee397a6062f77eb5fbfd6b7da /src/gallium/include | |
| parent | 87d7c1aa15a944d64e43b217e18553256f9fb681 (diff) | |
g3dvl: DRM winsys changes.
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_video_context.h | 20 | ||||
| -rw-r--r-- | src/gallium/include/state_tracker/dri1_api.h | 12 | ||||
| -rw-r--r-- | src/gallium/include/state_tracker/drm_api.h | 6 |
3 files changed, 26 insertions, 12 deletions
diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h index 6ae31418fa8..9ae595b224e 100644 --- a/src/gallium/include/pipe/p_video_context.h +++ b/src/gallium/include/pipe/p_video_context.h @@ -72,12 +72,6 @@ struct pipe_video_context struct pipe_macroblock *macroblocks, struct pipe_fence_handle **fence); - void (*clear_surface)(struct pipe_video_context *vpipe, - unsigned x, unsigned y, - unsigned width, unsigned height, - unsigned value, - struct pipe_surface *surface); - void (*render_picture)(struct pipe_video_context *vpipe, /*struct pipe_surface *backround, struct pipe_video_rect *backround_area,*/ @@ -95,6 +89,20 @@ struct pipe_video_context struct pipe_video_rect *layer_src_areas, struct pipe_video_rect *layer_dst_areas,*/ struct pipe_fence_handle **fence); + + void (*surface_fill)(struct pipe_video_context *vpipe, + struct pipe_surface *dst, + unsigned dstx, unsigned dsty, + unsigned width, unsigned height, + unsigned value); + + void (*surface_copy)(struct pipe_video_context *vpipe, + struct pipe_surface *dst, + unsigned dstx, unsigned dsty, + struct pipe_surface *src, + unsigned srcx, unsigned srcy, + unsigned width, unsigned height); + /*@}*/ /** diff --git a/src/gallium/include/state_tracker/dri1_api.h b/src/gallium/include/state_tracker/dri1_api.h index b173ba3683d..603f5d8af83 100644 --- a/src/gallium/include/state_tracker/dri1_api.h +++ b/src/gallium/include/state_tracker/dri1_api.h @@ -29,11 +29,11 @@ struct dri1_api_version struct dri1_api_lock_funcs { - void (*lock) (struct pipe_context * pipe); - void (*unlock) (struct pipe_context * locked_pipe); - boolean(*is_locked) (struct pipe_context * locked_pipe); - boolean(*is_lock_lost) (struct pipe_context * locked_pipe); - void (*clear_lost_lock) (struct pipe_context * locked_pipe); + void (*lock) (void *pipe_priv); + void (*unlock) (void *locked_pipe_priv); + boolean(*is_locked) (void *locked_pipe_priv); + boolean(*is_lock_lost) (void *locked_pipe_priv); + void (*clear_lost_lock) (void *locked_pipe_priv); }; struct dri1_api @@ -46,7 +46,7 @@ struct dri1_api /*@{ */ - struct pipe_surface *(*front_srf_locked) (struct pipe_context * + struct pipe_surface *(*front_srf_locked) (struct pipe_screen * locked_pipe); void (*present_locked) (struct pipe_context * locked_pipe, diff --git a/src/gallium/include/state_tracker/drm_api.h b/src/gallium/include/state_tracker/drm_api.h index 4d1259e1ee7..ea0b91c5813 100644 --- a/src/gallium/include/state_tracker/drm_api.h +++ b/src/gallium/include/state_tracker/drm_api.h @@ -8,6 +8,7 @@ struct pipe_screen; struct pipe_winsys; struct pipe_buffer; struct pipe_context; +struct pipe_video_context; struct pipe_texture; enum drm_create_screen_mode { @@ -36,6 +37,11 @@ struct drm_api struct drm_create_screen_arg *arg); struct pipe_context* (*create_context)(struct drm_api *api, struct pipe_screen *screen); + struct pipe_video_context* (*create_video_context)(struct drm_api *api, + struct pipe_screen *screen, + enum pipe_video_profile profile, + enum pipe_video_chroma_format chroma_format, + unsigned width, unsigned height); /*@}*/ /** |