diff options
author | Christian König <[email protected]> | 2011-04-12 20:38:21 +0200 |
---|---|---|
committer | Christian König <[email protected]> | 2011-04-12 20:38:21 +0200 |
commit | b48676672592271597d07e5ece79cf4d3ffbe04b (patch) | |
tree | ba36b8e1b33c1aae44bb7a91a423eaed3d211d54 /src/gallium/state_trackers/xorg | |
parent | f63aba41fb7eba142b0b22a2a46cb264157c2505 (diff) |
xvmc: cleanup headers
Diffstat (limited to 'src/gallium/state_trackers/xorg')
-rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/attributes.c | 12 | ||||
-rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/block.c | 13 | ||||
-rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/context.c | 7 | ||||
-rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/subpicture.c | 7 | ||||
-rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/surface.c | 7 | ||||
-rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/xvmc_private.h | 17 |
6 files changed, 45 insertions, 18 deletions
diff --git a/src/gallium/state_trackers/xorg/xvmc/attributes.c b/src/gallium/state_trackers/xorg/xvmc/attributes.c index d23d8635b66..c1cea655241 100644 --- a/src/gallium/state_trackers/xorg/xvmc/attributes.c +++ b/src/gallium/state_trackers/xorg/xvmc/attributes.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -10,11 +10,11 @@ * distribute, sub license, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. @@ -22,13 +22,15 @@ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * + * **************************************************************************/ #include <assert.h> + #include <X11/Xlib.h> #include <X11/extensions/Xvlib.h> #include <X11/extensions/XvMClib.h> + #include <pipe/p_compiler.h> PUBLIC diff --git a/src/gallium/state_trackers/xorg/xvmc/block.c b/src/gallium/state_trackers/xorg/xvmc/block.c index c7da7a84a7b..6b0b21273f5 100644 --- a/src/gallium/state_trackers/xorg/xvmc/block.c +++ b/src/gallium/state_trackers/xorg/xvmc/block.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -10,11 +10,11 @@ * distribute, sub license, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. @@ -22,13 +22,16 @@ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * + * **************************************************************************/ #include <assert.h> + #include <X11/Xlib.h> #include <X11/extensions/XvMClib.h> + #include <util/u_memory.h> + #include "xvmc_private.h" PUBLIC diff --git a/src/gallium/state_trackers/xorg/xvmc/context.c b/src/gallium/state_trackers/xorg/xvmc/context.c index 6f136f2b121..b0338336ae8 100644 --- a/src/gallium/state_trackers/xorg/xvmc/context.c +++ b/src/gallium/state_trackers/xorg/xvmc/context.c @@ -26,15 +26,20 @@ **************************************************************************/ #include <assert.h> + #include <X11/Xlibint.h> #include <X11/extensions/XvMClib.h> + #include <pipe/p_screen.h> #include <pipe/p_video_context.h> #include <pipe/p_video_state.h> #include <pipe/p_state.h> -#include <vl_winsys.h> + #include <util/u_memory.h> + #include <vl/vl_csc.h> +#include <vl_winsys.h> + #include "xvmc_private.h" static Status Validate(Display *dpy, XvPortID port, int surface_type_id, diff --git a/src/gallium/state_trackers/xorg/xvmc/subpicture.c b/src/gallium/state_trackers/xorg/xvmc/subpicture.c index da9e87f50dd..1b884053eae 100644 --- a/src/gallium/state_trackers/xorg/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xorg/xvmc/subpicture.c @@ -26,17 +26,22 @@ **************************************************************************/ #include <assert.h> + #include <X11/Xlibint.h> #include <X11/extensions/XvMClib.h> #include <xorg/fourcc.h> -#include <vl_winsys.h> + #include <pipe/p_screen.h> #include <pipe/p_video_context.h> #include <pipe/p_state.h> + #include <util/u_memory.h> #include <util/u_math.h> #include <util/u_format.h> #include <util/u_sampler.h> + +#include <vl_winsys.h> + #include "xvmc_private.h" #define FOURCC_RGB 0x0000003 diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c index 10701856223..217f985bc40 100644 --- a/src/gallium/state_trackers/xorg/xvmc/surface.c +++ b/src/gallium/state_trackers/xorg/xvmc/surface.c @@ -27,14 +27,19 @@ #include <assert.h> #include <stdio.h> + #include <X11/Xlibint.h> -#include <vl_winsys.h> + #include <pipe/p_video_context.h> #include <pipe/p_video_state.h> #include <pipe/p_state.h> + #include <util/u_inlines.h> #include <util/u_memory.h> #include <util/u_math.h> + +#include <vl_winsys.h> + #include "xvmc_private.h" static enum pipe_mpeg12_picture_type PictureToPipe(int xvmc_pic) diff --git a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h index 9a5338c2923..b0239f4c46d 100644 --- a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h +++ b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h @@ -30,12 +30,20 @@ #include <X11/Xlib.h> #include <X11/extensions/XvMClib.h> + #include <util/u_debug.h> +#include <util/u_math.h> #define BLOCK_SIZE_SAMPLES 64 #define BLOCK_SIZE_BYTES (BLOCK_SIZE_SAMPLES * 2) struct vl_context; + +struct pipe_video_decoder; +struct pipe_video_compositor; +struct pipe_video_decode_buffer; +struct pipe_video_buffer; + struct pipe_sampler_view; struct pipe_fence_handle; @@ -93,14 +101,13 @@ typedef struct #define XVMC_ERR 1 #define XVMC_WARN 2 #define XVMC_TRACE 3 + static INLINE void XVMC_MSG(unsigned int level, const char *fmt, ...) { - static boolean check_dbg_level = TRUE; - static unsigned int debug_level; + static int debug_level = -1; - if (check_dbg_level) { - debug_level = debug_get_num_option("XVMC_DEBUG", 0); - check_dbg_level = FALSE; + if (debug_level == -1) { + debug_level = MIN2(debug_get_num_option("XVMC_DEBUG", 0), 0); } if (level <= debug_level) { |