diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:01:40 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:01:40 +0200 |
| commit | 4926c5748028d33da4808f8a5473aa7b2f2bdc62 (patch) | |
| tree | cc899247d6a3435ce56535cffd6a4a4190eb98d8 /src/gallium/include | |
| parent | dbf3a15313eed930a3d8fdde12e457259c43651b (diff) | |
| parent | 97a7cf230a70c64fff300931ae7c00aa00449c97 (diff) | |
Merge branch 'pipe-video' of git://anongit.freedesktop.org/~deathsimple/xvmc-r600 into pipe-video
Conflicts:
configure.ac
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 9 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_screen.h | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index e30b9904fa5..f8eeebf6a71 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -494,7 +494,10 @@ enum pipe_shader_cap #define PIPE_REFERENCED_FOR_READ (1 << 0) #define PIPE_REFERENCED_FOR_WRITE (1 << 1) +<<<<<<< HEAD +======= +>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 enum pipe_video_codec { PIPE_VIDEO_CODEC_UNKNOWN = 0, @@ -520,7 +523,10 @@ enum pipe_video_profile PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH }; +<<<<<<< HEAD +======= +>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 /** * Composite query types */ @@ -534,7 +540,10 @@ struct pipe_query_data_timestamp_disjoint uint64_t frequency; boolean disjoint; }; +<<<<<<< HEAD +======= +>>>>>>> 97a7cf230a70c64fff300931ae7c00aa00449c97 #ifdef __cplusplus } diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index 75eeaeba1f7..0303c5b2ea9 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -92,13 +92,21 @@ 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 |