From 19bcd21ed151cf1716f2f87dff0f712231aa2ce7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kai=20Wasserb=C3=A4ch?= Date: Sat, 27 Aug 2011 17:51:49 +0200 Subject: [PATCH] vl: 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/auxiliary/vl/vl_compositor.c | 12 ++++++------ src/gallium/auxiliary/vl/vl_compositor.h | 6 +++--- src/gallium/auxiliary/vl/vl_csc.c | 4 ++-- src/gallium/auxiliary/vl/vl_csc.h | 2 +- src/gallium/auxiliary/vl/vl_decoder.c | 4 ++-- src/gallium/auxiliary/vl/vl_decoder.h | 2 +- src/gallium/auxiliary/vl/vl_idct.c | 12 ++++++------ src/gallium/auxiliary/vl/vl_idct.h | 4 ++-- src/gallium/auxiliary/vl/vl_mc.c | 8 ++++---- src/gallium/auxiliary/vl/vl_mc.h | 6 +++--- src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c | 4 ++-- src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 8 ++++---- src/gallium/auxiliary/vl/vl_mpeg12_decoder.h | 2 +- src/gallium/auxiliary/vl/vl_vertex_buffers.c | 2 +- src/gallium/auxiliary/vl/vl_vertex_buffers.h | 4 ++-- src/gallium/auxiliary/vl/vl_video_buffer.c | 16 ++++++++-------- src/gallium/auxiliary/vl/vl_video_buffer.h | 4 ++-- src/gallium/auxiliary/vl/vl_vlc.h | 4 ++-- src/gallium/auxiliary/vl/vl_zscan.c | 18 +++++++++--------- src/gallium/auxiliary/vl/vl_zscan.h | 4 ++-- 20 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index c73f9769446..5fbba988683 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -27,14 +27,14 @@ #include -#include -#include +#include "pipe/p_compiler.h" +#include "pipe/p_context.h" -#include -#include -#include +#include "util/u_memory.h" +#include "util/u_draw.h" +#include "util/u_surface.h" -#include +#include "tgsi/tgsi_ureg.h" #include "vl_csc.h" #include "vl_types.h" diff --git a/src/gallium/auxiliary/vl/vl_compositor.h b/src/gallium/auxiliary/vl/vl_compositor.h index 207510092a0..b96d1016927 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.h +++ b/src/gallium/auxiliary/vl/vl_compositor.h @@ -28,9 +28,9 @@ #ifndef vl_compositor_h #define vl_compositor_h -#include -#include -#include +#include "pipe/p_state.h" +#include "pipe/p_video_decoder.h" +#include "pipe/p_video_state.h" #include "vl_types.h" diff --git a/src/gallium/auxiliary/vl/vl_csc.c b/src/gallium/auxiliary/vl/vl_csc.c index 4ca84e56a8c..21da95f3ceb 100644 --- a/src/gallium/auxiliary/vl/vl_csc.c +++ b/src/gallium/auxiliary/vl/vl_csc.c @@ -25,8 +25,8 @@ * **************************************************************************/ -#include -#include +#include "util/u_math.h" +#include "util/u_debug.h" #include "vl_csc.h" diff --git a/src/gallium/auxiliary/vl/vl_csc.h b/src/gallium/auxiliary/vl/vl_csc.h index 9b73fb3aef2..a6fb1fdba51 100644 --- a/src/gallium/auxiliary/vl/vl_csc.h +++ b/src/gallium/auxiliary/vl/vl_csc.h @@ -28,7 +28,7 @@ #ifndef vl_csc_h #define vl_csc_h -#include +#include "pipe/p_compiler.h" struct vl_procamp { diff --git a/src/gallium/auxiliary/vl/vl_decoder.c b/src/gallium/auxiliary/vl/vl_decoder.c index b23827d300a..41e5f75300a 100644 --- a/src/gallium/auxiliary/vl/vl_decoder.c +++ b/src/gallium/auxiliary/vl/vl_decoder.c @@ -25,9 +25,9 @@ * **************************************************************************/ -#include +#include "pipe/p_video_decoder.h" -#include +#include "util/u_video.h" #include "vl_decoder.h" #include "vl_mpeg12_decoder.h" diff --git a/src/gallium/auxiliary/vl/vl_decoder.h b/src/gallium/auxiliary/vl/vl_decoder.h index fed529c9bc7..54dc42370f7 100644 --- a/src/gallium/auxiliary/vl/vl_decoder.h +++ b/src/gallium/auxiliary/vl/vl_decoder.h @@ -29,7 +29,7 @@ #ifndef vl_decoder_h #define vl_decoder_h -#include +#include "pipe/p_video_decoder.h" /** * check if a given profile is supported with shader based decoding diff --git a/src/gallium/auxiliary/vl/vl_idct.c b/src/gallium/auxiliary/vl/vl_idct.c index ad786145392..a2b35371c94 100644 --- a/src/gallium/auxiliary/vl/vl_idct.c +++ b/src/gallium/auxiliary/vl/vl_idct.c @@ -27,14 +27,14 @@ #include -#include -#include +#include "pipe/p_context.h" +#include "pipe/p_screen.h" -#include -#include -#include +#include "util/u_draw.h" +#include "util/u_sampler.h" +#include "util/u_memory.h" -#include +#include "tgsi/tgsi_ureg.h" #include "vl_defines.h" #include "vl_types.h" diff --git a/src/gallium/auxiliary/vl/vl_idct.h b/src/gallium/auxiliary/vl/vl_idct.h index 98e2c795564..1d19d8146fc 100644 --- a/src/gallium/auxiliary/vl/vl_idct.h +++ b/src/gallium/auxiliary/vl/vl_idct.h @@ -28,9 +28,9 @@ #ifndef vl_idct_h #define vl_idct_h -#include +#include "pipe/p_state.h" -#include +#include "tgsi/tgsi_ureg.h" /* shader based inverse distinct cosinus transformation * expect usage of vl_vertex_buffers as a todo list diff --git a/src/gallium/auxiliary/vl/vl_mc.c b/src/gallium/auxiliary/vl/vl_mc.c index 0b3723c9792..9534a8f0050 100644 --- a/src/gallium/auxiliary/vl/vl_mc.c +++ b/src/gallium/auxiliary/vl/vl_mc.c @@ -27,12 +27,12 @@ #include -#include +#include "pipe/p_context.h" -#include -#include +#include "util/u_sampler.h" +#include "util/u_draw.h" -#include +#include "tgsi/tgsi_ureg.h" #include "vl_defines.h" #include "vl_vertex_buffers.h" diff --git a/src/gallium/auxiliary/vl/vl_mc.h b/src/gallium/auxiliary/vl/vl_mc.h index 9fabf02a3ac..081562aa744 100644 --- a/src/gallium/auxiliary/vl/vl_mc.h +++ b/src/gallium/auxiliary/vl/vl_mc.h @@ -28,10 +28,10 @@ #ifndef vl_mc_h #define vl_mc_h -#include -#include +#include "pipe/p_state.h" +#include "pipe/p_video_state.h" -#include +#include "tgsi/tgsi_ureg.h" #include "vl_defines.h" #include "vl_types.h" diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c index 9e48bdb9ac5..936cf2cfc93 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c @@ -26,8 +26,8 @@ * **************************************************************************/ -#include -#include +#include "pipe/p_video_decoder.h" +#include "util/u_memory.h" #include "vl_vlc.h" #include "vl_mpeg12_bitstream.h" diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index 7d53168afe5..9ea84dc2cc9 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -28,10 +28,10 @@ #include #include -#include -#include -#include -#include +#include "util/u_memory.h" +#include "util/u_rect.h" +#include "util/u_sampler.h" +#include "util/u_video.h" #include "vl_mpeg12_decoder.h" #include "vl_defines.h" diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h index 4a8d65335f6..5f048f096ba 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.h @@ -28,7 +28,7 @@ #ifndef vl_mpeg12_decoder_h #define vl_mpeg12_decoder_h -#include +#include "pipe/p_video_decoder.h" #include "vl_mpeg12_bitstream.h" #include "vl_zscan.h" diff --git a/src/gallium/auxiliary/vl/vl_vertex_buffers.c b/src/gallium/auxiliary/vl/vl_vertex_buffers.c index 281db8018eb..e2665a5cfde 100644 --- a/src/gallium/auxiliary/vl/vl_vertex_buffers.c +++ b/src/gallium/auxiliary/vl/vl_vertex_buffers.c @@ -26,7 +26,7 @@ **************************************************************************/ #include -#include +#include "util/u_format.h" #include "vl_vertex_buffers.h" #include "vl_types.h" diff --git a/src/gallium/auxiliary/vl/vl_vertex_buffers.h b/src/gallium/auxiliary/vl/vl_vertex_buffers.h index 874ecce9041..0a865996005 100644 --- a/src/gallium/auxiliary/vl/vl_vertex_buffers.h +++ b/src/gallium/auxiliary/vl/vl_vertex_buffers.h @@ -27,8 +27,8 @@ #ifndef vl_vertex_buffers_h #define vl_vertex_buffers_h -#include -#include +#include "pipe/p_state.h" +#include "pipe/p_video_state.h" #include "vl_defines.h" #include "vl_types.h" diff --git a/src/gallium/auxiliary/vl/vl_video_buffer.c b/src/gallium/auxiliary/vl/vl_video_buffer.c index 4d8b6649dd2..ae15c15c3ae 100644 --- a/src/gallium/auxiliary/vl/vl_video_buffer.c +++ b/src/gallium/auxiliary/vl/vl_video_buffer.c @@ -27,14 +27,14 @@ #include -#include -#include -#include - -#include -#include -#include -#include +#include "pipe/p_screen.h" +#include "pipe/p_context.h" +#include "pipe/p_state.h" + +#include "util/u_format.h" +#include "util/u_inlines.h" +#include "util/u_sampler.h" +#include "util/u_memory.h" #include "vl_video_buffer.h" diff --git a/src/gallium/auxiliary/vl/vl_video_buffer.h b/src/gallium/auxiliary/vl/vl_video_buffer.h index 291d15c1e9d..c4c139c1ed3 100644 --- a/src/gallium/auxiliary/vl/vl_video_buffer.h +++ b/src/gallium/auxiliary/vl/vl_video_buffer.h @@ -28,8 +28,8 @@ #ifndef vl_ycbcr_buffer_h #define vl_ycbcr_buffer_h -#include -#include +#include "pipe/p_context.h" +#include "pipe/p_video_decoder.h" #include "vl_defines.h" diff --git a/src/gallium/auxiliary/vl/vl_vlc.h b/src/gallium/auxiliary/vl/vl_vlc.h index e17eae83fb3..dc4faedfcbb 100644 --- a/src/gallium/auxiliary/vl/vl_vlc.h +++ b/src/gallium/auxiliary/vl/vl_vlc.h @@ -30,9 +30,9 @@ #include -#include +#include "pipe/p_compiler.h" -#include +#include "util/u_math.h" #include "util/u_pointer.h" struct vl_vlc diff --git a/src/gallium/auxiliary/vl/vl_zscan.c b/src/gallium/auxiliary/vl/vl_zscan.c index fde27f396c5..b720d538f9c 100644 --- a/src/gallium/auxiliary/vl/vl_zscan.c +++ b/src/gallium/auxiliary/vl/vl_zscan.c @@ -27,18 +27,18 @@ #include -#include -#include +#include "pipe/p_screen.h" +#include "pipe/p_context.h" -#include -#include -#include -#include +#include "util/u_draw.h" +#include "util/u_sampler.h" +#include "util/u_inlines.h" +#include "util/u_memory.h" -#include +#include "tgsi/tgsi_ureg.h" -#include -#include +#include "vl_defines.h" +#include "vl_types.h" #include "vl_zscan.h" #include "vl_vertex_buffers.h" diff --git a/src/gallium/auxiliary/vl/vl_zscan.h b/src/gallium/auxiliary/vl/vl_zscan.h index dd8a943bfb2..ec90c1738b2 100644 --- a/src/gallium/auxiliary/vl/vl_zscan.h +++ b/src/gallium/auxiliary/vl/vl_zscan.h @@ -28,8 +28,8 @@ #ifndef vl_zscan_h #define vl_zscan_h -#include -#include +#include "pipe/p_compiler.h" +#include "pipe/p_state.h" /* * shader based zscan and quantification -- 2.30.2