summaryrefslogtreecommitdiffstats
path: root/src/gallium/include/pipe/p_defines.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2011-07-14 08:09:21 -0600
committerBrian Paul <[email protected]>2011-07-14 08:14:14 -0600
commita5a942256162eb0ca4df2f8202a916b080396141 (patch)
tree283b1b84294178bb7f476fc2170f91eee424992c /src/gallium/include/pipe/p_defines.h
parent9726947b681225a5a438eaa7cb70c5fa36ce85ea (diff)
gallium: put video-related enums in separate header
The forward references to video enum types in p_context.h causes a massive number of compiler warnings (ISO C forbids forward references to ‘enum’ types). By putting the new video enums in a separate header that can be included by p_context.h and p_screen.h we can avoid this. Acked-by Christian König <[email protected]>
Diffstat (limited to 'src/gallium/include/pipe/p_defines.h')
-rw-r--r--src/gallium/include/pipe/p_defines.h41
1 files changed, 0 insertions, 41 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 7f1bf0dee68..79b89699566 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -493,47 +493,6 @@ enum pipe_shader_cap
PIPE_SHADER_CAP_SUBROUTINES = 16, /* BGNSUB, ENDSUB, CAL, RET */
};
-/* Video caps, can be different for each codec/profile */
-enum pipe_video_cap
-{
- PIPE_VIDEO_CAP_SUPPORTED = 0,
- PIPE_VIDEO_CAP_NPOT_TEXTURES = 1,
- PIPE_VIDEO_CAP_MAX_WIDTH = 2,
- PIPE_VIDEO_CAP_MAX_HEIGHT = 3,
-};
-
-enum pipe_video_codec
-{
- PIPE_VIDEO_CODEC_UNKNOWN = 0,
- PIPE_VIDEO_CODEC_MPEG12, /**< MPEG1, MPEG2 */
- PIPE_VIDEO_CODEC_MPEG4, /**< DIVX, XVID */
- PIPE_VIDEO_CODEC_VC1, /**< WMV */
- PIPE_VIDEO_CODEC_MPEG4_AVC /**< H.264 */
-};
-
-enum pipe_video_profile
-{
- PIPE_VIDEO_PROFILE_UNKNOWN,
- PIPE_VIDEO_PROFILE_MPEG1,
- PIPE_VIDEO_PROFILE_MPEG2_SIMPLE,
- PIPE_VIDEO_PROFILE_MPEG2_MAIN,
- PIPE_VIDEO_PROFILE_MPEG4_SIMPLE,
- PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE,
- PIPE_VIDEO_PROFILE_VC1_SIMPLE,
- PIPE_VIDEO_PROFILE_VC1_MAIN,
- PIPE_VIDEO_PROFILE_VC1_ADVANCED,
- PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE,
- PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN,
- PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH
-};
-
-enum pipe_video_entrypoint
-{
- PIPE_VIDEO_ENTRYPOINT_UNKNOWN,
- PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
- PIPE_VIDEO_ENTRYPOINT_IDCT,
- PIPE_VIDEO_ENTRYPOINT_MC
-};
/**
* Composite query types