Mesa (master): r600g: Fix include style

Brian Paul brianp at kemper.freedesktop.org
Mon Aug 29 07:12:03 PDT 2011


Module: Mesa
Branch: master
Commit: 8fb7f1a8a4cbab5365491b4b41e50ff3f03306c8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fb7f1a8a4cbab5365491b4b41e50ff3f03306c8

Author: Kai Wasserbäch <kai at dev.carbon-project.org>
Date:   Sat Aug 27 17:51:51 2011 +0200

r600g: 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]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/drivers/r600/evergreen_state.c   |   30 +++++++++++-----------
 src/gallium/drivers/r600/r600_blit.c         |    6 ++--
 src/gallium/drivers/r600/r600_buffer.c       |   10 ++++----
 src/gallium/drivers/r600/r600_pipe.c         |   34 +++++++++++++-------------
 src/gallium/drivers/r600/r600_pipe.h         |    8 +++---
 src/gallium/drivers/r600/r600_state.c        |   24 +++++++++---------
 src/gallium/drivers/r600/r600_state_common.c |    6 ++--
 src/gallium/drivers/r600/r600_texture.c      |   12 ++++----
 src/gallium/drivers/r600/r600_translate.c    |    2 +-
 9 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 2135b8a..174446e 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -26,21 +26,21 @@
  */
 #include <stdio.h>
 #include <errno.h>
-#include <pipe/p_defines.h>
-#include <pipe/p_state.h>
-#include <pipe/p_context.h>
-#include <tgsi/tgsi_scan.h>
-#include <tgsi/tgsi_parse.h>
-#include <tgsi/tgsi_util.h>
-#include <util/u_blitter.h>
-#include <util/u_double_list.h>
-#include <util/u_transfer.h>
-#include <util/u_surface.h>
-#include <util/u_pack_color.h>
-#include <util/u_memory.h>
-#include <util/u_inlines.h>
-#include <util/u_framebuffer.h>
-#include <pipebuffer/pb_buffer.h>
+#include "pipe/p_defines.h"
+#include "pipe/p_state.h"
+#include "pipe/p_context.h"
+#include "tgsi/tgsi_scan.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_util.h"
+#include "util/u_blitter.h"
+#include "util/u_double_list.h"
+#include "util/u_transfer.h"
+#include "util/u_surface.h"
+#include "util/u_pack_color.h"
+#include "util/u_memory.h"
+#include "util/u_inlines.h"
+#include "util/u_framebuffer.h"
+#include "pipebuffer/pb_buffer.h"
 #include "r600.h"
 #include "evergreend.h"
 #include "r600_resource.h"
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 2f7e871..ba0790c 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -20,9 +20,9 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include <util/u_surface.h>
-#include <util/u_blitter.h>
-#include <util/u_format.h>
+#include "util/u_surface.h"
+#include "util/u_blitter.h"
+#include "util/u_format.h"
 #include "r600_pipe.h"
 
 enum r600_blitter_op /* bitmask */
diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index ca2415a..73d17b0 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -26,11 +26,11 @@
  */
 #include <byteswap.h>
 
-#include <pipe/p_screen.h>
-#include <util/u_format.h>
-#include <util/u_math.h>
-#include <util/u_inlines.h>
-#include <util/u_memory.h>
+#include "pipe/p_screen.h"
+#include "util/u_format.h"
+#include "util/u_math.h"
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
 
 #include "r600.h"
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index ceaebbb..821c0d7 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -22,26 +22,26 @@
  */
 #include <stdio.h>
 #include <errno.h>
-#include <pipe/p_defines.h>
-#include <pipe/p_state.h>
-#include <pipe/p_context.h>
-#include <tgsi/tgsi_scan.h>
-#include <tgsi/tgsi_parse.h>
-#include <tgsi/tgsi_util.h>
-#include <util/u_blitter.h>
-#include <util/u_double_list.h>
+#include "pipe/p_defines.h"
+#include "pipe/p_state.h"
+#include "pipe/p_context.h"
+#include "tgsi/tgsi_scan.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_util.h"
+#include "util/u_blitter.h"
+#include "util/u_double_list.h"
 #include "util/u_format.h"
-#include <util/u_format_s3tc.h>
-#include <util/u_transfer.h>
-#include <util/u_surface.h>
-#include <util/u_pack_color.h>
-#include <util/u_memory.h>
-#include <util/u_inlines.h>
+#include "util/u_format_s3tc.h"
+#include "util/u_transfer.h"
+#include "util/u_surface.h"
+#include "util/u_pack_color.h"
+#include "util/u_memory.h"
+#include "util/u_inlines.h"
 #include "util/u_upload_mgr.h"
-#include <vl/vl_decoder.h>
-#include <vl/vl_video_buffer.h>
+#include "vl/vl_decoder.h"
+#include "vl/vl_video_buffer.h"
 #include "os/os_time.h"
-#include <pipebuffer/pb_buffer.h>
+#include "pipebuffer/pb_buffer.h"
 #include "r600.h"
 #include "r600d.h"
 #include "r600_resource.h"
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 2747f54..a9d5ef5 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -28,10 +28,10 @@
 
 #include "../../winsys/radeon/drm/radeon_winsys.h"
 
-#include <pipe/p_state.h>
-#include <pipe/p_screen.h>
-#include <pipe/p_context.h>
-#include <util/u_math.h>
+#include "pipe/p_state.h"
+#include "pipe/p_screen.h"
+#include "pipe/p_context.h"
+#include "util/u_math.h"
 #include "util/u_slab.h"
 #include "util/u_vbuf_mgr.h"
 #include "r600.h"
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index fba2af8..326bbff 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -26,19 +26,19 @@
  */
 #include <stdio.h>
 #include <errno.h>
-#include <pipe/p_defines.h>
-#include <pipe/p_state.h>
-#include <pipe/p_context.h>
-#include <tgsi/tgsi_scan.h>
-#include <tgsi/tgsi_parse.h>
-#include <tgsi/tgsi_util.h>
-#include <util/u_double_list.h>
-#include <util/u_pack_color.h>
-#include <util/u_memory.h>
-#include <util/u_inlines.h>
-#include <util/u_framebuffer.h>
+#include "pipe/p_defines.h"
+#include "pipe/p_state.h"
+#include "pipe/p_context.h"
+#include "tgsi/tgsi_scan.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_util.h"
+#include "util/u_double_list.h"
+#include "util/u_pack_color.h"
+#include "util/u_memory.h"
+#include "util/u_inlines.h"
+#include "util/u_framebuffer.h"
 #include "util/u_transfer.h"
-#include <pipebuffer/pb_buffer.h>
+#include "pipebuffer/pb_buffer.h"
 #include "r600.h"
 #include "r600d.h"
 #include "r600_resource.h"
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 853458f..4d23833 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -24,9 +24,9 @@
  * Authors: Dave Airlie <airlied at redhat.com>
  *          Jerome Glisse <jglisse at redhat.com>
  */
-#include <util/u_memory.h>
-#include <util/u_format.h>
-#include <pipebuffer/pb_buffer.h>
+#include "util/u_memory.h"
+#include "util/u_format.h"
+#include "pipebuffer/pb_buffer.h"
 #include "pipe/p_shader_tokens.h"
 #include "tgsi/tgsi_parse.h"
 #include "r600_formats.h"
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 7c1bd9d..3bd5350 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -25,12 +25,12 @@
  *      Corbin Simpson
  */
 #include <errno.h>
-#include <pipe/p_screen.h>
-#include <util/u_format.h>
-#include <util/u_format_s3tc.h>
-#include <util/u_math.h>
-#include <util/u_inlines.h>
-#include <util/u_memory.h>
+#include "pipe/p_screen.h"
+#include "util/u_format.h"
+#include "util/u_format_s3tc.h"
+#include "util/u_math.h"
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
 #include "pipebuffer/pb_buffer.h"
 #include "r600_pipe.h"
 #include "r600_resource.h"
diff --git a/src/gallium/drivers/r600/r600_translate.c b/src/gallium/drivers/r600/r600_translate.c
index 307fd57..32f683b 100644
--- a/src/gallium/drivers/r600/r600_translate.c
+++ b/src/gallium/drivers/r600/r600_translate.c
@@ -23,7 +23,7 @@
  * Authors: Dave Airlie <airlied at redhat.com>
  */
 
-#include <util/u_index_modify.h>
+#include "util/u_index_modify.h"
 #include "util/u_inlines.h"
 #include "util/u_upload_mgr.h"
 #include "r600_pipe.h"



More information about the mesa-commit mailing list