diff options
| author | Christian König <[email protected]> | 2011-01-10 23:41:08 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-10 23:41:08 +0100 |
| commit | 9032d2a13ecd019206a48767d9205c0aafa7cca2 (patch) | |
| tree | 5bd816287ab7ace941a455e02b1da7bd94571cf9 /src/gallium/include/pipe/p_screen.h | |
| parent | b725bbebae19890ceaaa31c1d7fb7f155ac3b6ef (diff) | |
| parent | 2b296ec77c2b95e7632b45100de5a0878ac2a294 (diff) | |
Merge remote branch 'vdpau/pipe-video' into pipe-video
Conflicts:
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_format.h
src/gallium/state_trackers/xorg/xvmc/context.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/gallium/include/pipe/p_screen.h')
| -rw-r--r-- | src/gallium/include/pipe/p_screen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index ef03ed74a20..2a6acecb726 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -92,14 +92,14 @@ struct pipe_screen { */ int (*get_shader_param)( struct pipe_screen *, unsigned shader, enum pipe_shader_cap param ); - struct pipe_context * (*context_create)( struct pipe_screen *, - void *priv ); + struct pipe_context * (*context_create)( struct pipe_screen *, void *priv ); struct pipe_video_context * (*video_context_create)( struct pipe_screen *screen, enum pipe_video_profile profile, enum pipe_video_chroma_format chroma_format, unsigned width, unsigned height, void *priv ); + /** * Check if the given pipe_format is supported as a texture or * drawing surface. |