From 28f8ff6b622d63e8ffe322ab2cdf5197941f1a40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kai=20Wasserb=C3=A4ch?= Date: Sat, 27 Aug 2011 17:51:55 +0200 Subject: [PATCH] vdpau: Fix include style MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/gallium/state_trackers/vdpau/decode.c | 6 +++--- src/gallium/state_trackers/vdpau/device.c | 8 ++++---- src/gallium/state_trackers/vdpau/htab.c | 4 ++-- src/gallium/state_trackers/vdpau/mixer.c | 6 +++--- src/gallium/state_trackers/vdpau/output.c | 6 +++--- src/gallium/state_trackers/vdpau/presentation.c | 4 ++-- src/gallium/state_trackers/vdpau/query.c | 11 ++++++----- src/gallium/state_trackers/vdpau/surface.c | 8 ++++---- src/gallium/state_trackers/vdpau/vdpau_private.h | 10 +++++----- 9 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index 50d63ea3f73..2bf782ef220 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -25,9 +25,9 @@ * **************************************************************************/ -#include -#include -#include +#include "util/u_memory.h" +#include "util/u_math.h" +#include "util/u_debug.h" #include "vdpau_private.h" diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c index 200d5f62f63..4fcce9112aa 100644 --- a/src/gallium/state_trackers/vdpau/device.c +++ b/src/gallium/state_trackers/vdpau/device.c @@ -25,12 +25,12 @@ * **************************************************************************/ -#include +#include "pipe/p_compiler.h" -#include -#include +#include "util/u_memory.h" +#include "util/u_debug.h" -#include +#include "vl_winsys.h" #include "vdpau_private.h" diff --git a/src/gallium/state_trackers/vdpau/htab.c b/src/gallium/state_trackers/vdpau/htab.c index 20f5a171f19..39ff7be3786 100644 --- a/src/gallium/state_trackers/vdpau/htab.c +++ b/src/gallium/state_trackers/vdpau/htab.c @@ -25,8 +25,8 @@ * **************************************************************************/ -#include -#include +#include "util/u_handle_table.h" +#include "os/os_thread.h" #include "vdpau_private.h" #ifdef VL_HANDLES diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c index 5c3c6c69548..202f6ae449f 100644 --- a/src/gallium/state_trackers/vdpau/mixer.c +++ b/src/gallium/state_trackers/vdpau/mixer.c @@ -27,10 +27,10 @@ #include -#include -#include +#include "util/u_memory.h" +#include "util/u_debug.h" -#include +#include "vl/vl_csc.h" #include "vdpau_private.h" diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c index bc4b39ae75c..332690f0ff7 100644 --- a/src/gallium/state_trackers/vdpau/output.c +++ b/src/gallium/state_trackers/vdpau/output.c @@ -28,9 +28,9 @@ #include -#include -#include -#include +#include "util/u_debug.h" +#include "util/u_memory.h" +#include "util/u_sampler.h" #include "vdpau_private.h" diff --git a/src/gallium/state_trackers/vdpau/presentation.c b/src/gallium/state_trackers/vdpau/presentation.c index 7e324db5589..ccd47870125 100644 --- a/src/gallium/state_trackers/vdpau/presentation.c +++ b/src/gallium/state_trackers/vdpau/presentation.c @@ -29,8 +29,8 @@ #include -#include -#include +#include "util/u_debug.h" +#include "util/u_memory.h" #include "vdpau_private.h" diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c index ec17e59118f..8cb95ae3338 100644 --- a/src/gallium/state_trackers/vdpau/query.c +++ b/src/gallium/state_trackers/vdpau/query.c @@ -25,13 +25,14 @@ * **************************************************************************/ -#include "vdpau_private.h" -#include #include -#include -#include #include -#include + +#include "vdpau_private.h" +#include "vl_winsys.h" +#include "pipe/p_screen.h" +#include "pipe/p_defines.h" +#include "util/u_debug.h" VdpStatus diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/state_trackers/vdpau/surface.c index d3f6b5d8bc5..4f73c40a06b 100644 --- a/src/gallium/state_trackers/vdpau/surface.c +++ b/src/gallium/state_trackers/vdpau/surface.c @@ -28,11 +28,11 @@ #include -#include +#include "pipe/p_state.h" -#include -#include -#include +#include "util/u_memory.h" +#include "util/u_debug.h" +#include "util/u_rect.h" #include "vdpau_private.h" diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h index 5482eff0630..263e2545a4e 100644 --- a/src/gallium/state_trackers/vdpau/vdpau_private.h +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h @@ -33,13 +33,13 @@ #include #include -#include -#include +#include "pipe/p_compiler.h" +#include "pipe/p_video_decoder.h" -#include -#include +#include "util/u_debug.h" +#include "vl/vl_compositor.h" -#include +#include "vl_winsys.h" #define INFORMATION G3DVL VDPAU Driver Shared Library version VER_MAJOR.VER_MINOR #define QUOTEME(x) #x -- 2.30.2