diff options
| author | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
| commit | 772b25e1f366edc857e77b8c1ccdc5297d82cc41 (patch) | |
| tree | 88d38b52e80319dbd4a0c5b5e038d92f1105110a /src/gallium/winsys/g3dvl/vl_winsys.h | |
| parent | ab130400cf91ab471e265e58193c95f04c7aeeda (diff) | |
| parent | b3d2ec9942303d1d03e28a25b030eb060415abfb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/gallium/winsys/g3dvl/vl_winsys.h')
| -rw-r--r-- | src/gallium/winsys/g3dvl/vl_winsys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/winsys/g3dvl/vl_winsys.h b/src/gallium/winsys/g3dvl/vl_winsys.h index 381478637a8..58f548849f6 100644 --- a/src/gallium/winsys/g3dvl/vl_winsys.h +++ b/src/gallium/winsys/g3dvl/vl_winsys.h @@ -61,7 +61,7 @@ vl_video_create(struct vl_screen *vscreen, void vl_video_destroy(struct vl_context *vctx); struct pipe_surface* -vl_drawable_surface_get(struct vl_screen *vscreen, Drawable drawable); +vl_drawable_surface_get(struct vl_context *vctx, Drawable drawable); void* vl_contextprivate_get(struct vl_context *vctx, struct pipe_surface *drawable_surface); |