From: Kai Wasserbäch Date: Sat, 27 Aug 2011 15:51:56 +0000 (+0200) Subject: st/xorg: Fix include style X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ea550621e25f9b2f344b2ed60551ceec91b3fcf;p=mesa.git st/xorg: Fix include style As explained in the thread starting at [0], the internal include style should be »#include "path/to/header.h"« for non-system includes. [0] Signed-off-by: Kai Wasserbäch Signed-off-by: Brian Paul --- diff --git a/src/gallium/state_trackers/xorg/xorg_exa.h b/src/gallium/state_trackers/xorg/xorg_exa.h index 30b6f0ce460..47501f9affe 100644 --- a/src/gallium/state_trackers/xorg/xorg_exa.h +++ b/src/gallium/state_trackers/xorg/xorg_exa.h @@ -3,7 +3,7 @@ #include "xorg_tracker.h" -#include +#include "pipe/p_state.h" struct cso_context; struct xorg_shaders; diff --git a/src/gallium/state_trackers/xorg/xvmc/attributes.c b/src/gallium/state_trackers/xorg/xvmc/attributes.c index 817af531a32..b115d520932 100644 --- a/src/gallium/state_trackers/xorg/xvmc/attributes.c +++ b/src/gallium/state_trackers/xorg/xvmc/attributes.c @@ -32,7 +32,7 @@ #include #include -#include +#include "vl/vl_compositor.h" #include "xvmc_private.h" diff --git a/src/gallium/state_trackers/xorg/xvmc/block.c b/src/gallium/state_trackers/xorg/xvmc/block.c index 6b0b21273f5..64f8497e77c 100644 --- a/src/gallium/state_trackers/xorg/xvmc/block.c +++ b/src/gallium/state_trackers/xorg/xvmc/block.c @@ -30,7 +30,7 @@ #include #include -#include +#include "util/u_memory.h" #include "xvmc_private.h" diff --git a/src/gallium/state_trackers/xorg/xvmc/context.c b/src/gallium/state_trackers/xorg/xvmc/context.c index f21ebda76d3..172f16cfb63 100644 --- a/src/gallium/state_trackers/xorg/xvmc/context.c +++ b/src/gallium/state_trackers/xorg/xvmc/context.c @@ -30,15 +30,15 @@ #include #include -#include -#include -#include -#include +#include "pipe/p_screen.h" +#include "pipe/p_video_decoder.h" +#include "pipe/p_video_state.h" +#include "pipe/p_state.h" -#include +#include "util/u_memory.h" -#include -#include +#include "vl/vl_csc.h" +#include "vl_winsys.h" #include "xvmc_private.h" diff --git a/src/gallium/state_trackers/xorg/xvmc/subpicture.c b/src/gallium/state_trackers/xorg/xvmc/subpicture.c index 7d6ff061eb7..95a63c886c8 100644 --- a/src/gallium/state_trackers/xorg/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xorg/xvmc/subpicture.c @@ -31,17 +31,17 @@ #include #include -#include -#include -#include +#include "pipe/p_screen.h" +#include "pipe/p_video_decoder.h" +#include "pipe/p_state.h" -#include -#include -#include -#include -#include +#include "util/u_memory.h" +#include "util/u_math.h" +#include "util/u_format.h" +#include "util/u_sampler.h" +#include "util/u_rect.h" -#include +#include "vl_winsys.h" #include "xvmc_private.h" diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c index 79bd9c618ce..521bc42ba82 100644 --- a/src/gallium/state_trackers/xorg/xvmc/surface.c +++ b/src/gallium/state_trackers/xorg/xvmc/surface.c @@ -30,15 +30,15 @@ #include -#include -#include -#include +#include "pipe/p_video_decoder.h" +#include "pipe/p_video_state.h" +#include "pipe/p_state.h" -#include -#include -#include +#include "util/u_inlines.h" +#include "util/u_memory.h" +#include "util/u_math.h" -#include +#include "vl_winsys.h" #include "xvmc_private.h" diff --git a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h index fd14ac916ee..43ae7171389 100644 --- a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h +++ b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h @@ -31,13 +31,13 @@ #include #include -#include +#include "pipe/p_video_state.h" -#include -#include +#include "util/u_debug.h" +#include "util/u_math.h" -#include -#include +#include "vl/vl_csc.h" +#include "vl/vl_compositor.h" #define BLOCK_SIZE_SAMPLES 64 #define BLOCK_SIZE_BYTES (BLOCK_SIZE_SAMPLES * 2)