diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:44:19 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:44:19 +0200 |
| commit | 6ac1bbe21a978e326e6361426343b61d10140aa3 (patch) | |
| tree | fe2d55e6512479bcd3be144e385e1e727ce19b91 /src/gallium/include/pipe/p_screen.h | |
| parent | 4926c5748028d33da4808f8a5473aa7b2f2bdc62 (diff) | |
vl: pipe-video branch merged with Königs pipe-video branch
Diffstat (limited to 'src/gallium/include/pipe/p_screen.h')
| -rw-r--r-- | src/gallium/include/pipe/p_screen.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index 0303c5b2ea9..75eeaeba1f7 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -92,21 +92,13 @@ struct pipe_screen { */ int (*get_shader_param)( struct pipe_screen *, unsigned shader, enum pipe_shader_cap param ); -<<<<<<< HEAD struct pipe_context * (*context_create)( struct pipe_screen *, void *priv ); -======= - struct pipe_context * (*context_create)( struct pipe_screen *, - void *priv ); ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 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 ); -<<<<<<< HEAD -======= ->>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 /** * Check if the given pipe_format is supported as a texture or |