summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Wasserbäch <kai@dev.carbon-project.org>2011-08-27 17:51:53 +0200
committerBrian Paul <brianp@vmware.com>2011-08-29 08:02:55 -0600
commit92bc1111f3c5dd3616bd591129aebd3f4307e5b4 (patch)
treee8629498dba2bcc068a9448c0ee36f5ba2c9bcd0
parent51ecb33c6b218af8e7c401a701b51f52331a1782 (diff)
d3d1x: 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@dev.carbon-project.org> Signed-off-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h6
-rw-r--r--src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp8
-rw-r--r--src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp4
-rw-r--r--src/gallium/state_trackers/d3d1x/dxgid3d11/dxgid3d11.cpp4
-rw-r--r--src/gallium/state_trackers/d3d1x/gd3d1x/d3d1x_private.h16
5 files changed, 19 insertions, 19 deletions
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
index af355f0227..e197c0ca79 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
@@ -49,9 +49,9 @@ namespace std
extern "C"
{
-#include <util/u_atomic.h>
-#include <pipe/p_format.h>
-#include <os/os_thread.h>
+#include "util/u_atomic.h"
+#include "pipe/p_format.h"
+#include "os/os_thread.h"
}
#include <assert.h>
diff --git a/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp b/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
index 0bb9d852f8..0c80738b7a 100644
--- a/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
+++ b/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
@@ -27,10 +27,10 @@
#include "dxgi_private.h"
extern "C" {
#include "native.h"
-#include <util/u_format.h>
-#include <util/u_inlines.h>
-#include <util/u_simple_shaders.h>
-#include <pipe/p_shader_tokens.h>
+#include "util/u_format.h"
+#include "util/u_inlines.h"
+#include "util/u_simple_shaders.h"
+#include "pipe/p_shader_tokens.h"
}
#include <iostream>
#include <memory>
diff --git a/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp b/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp
index 96073d4ebc..cdc5df4b91 100644
--- a/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp
+++ b/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp
@@ -27,8 +27,8 @@
#include "d3d1xstutil.h"
#include "galliumd3d10_1.h"
#include <dxgi.h>
-#include <pipe/p_screen.h>
-#include <pipe/p_context.h>
+#include "pipe/p_screen.h"
+#include "pipe/p_context.h"
HRESULT D3D10CreateDevice1(
IDXGIAdapter *adapter,
diff --git a/src/gallium/state_trackers/d3d1x/dxgid3d11/dxgid3d11.cpp b/src/gallium/state_trackers/d3d1x/dxgid3d11/dxgid3d11.cpp
index 1b1cb907d3..b93ffb2040 100644
--- a/src/gallium/state_trackers/d3d1x/dxgid3d11/dxgid3d11.cpp
+++ b/src/gallium/state_trackers/d3d1x/dxgid3d11/dxgid3d11.cpp
@@ -27,8 +27,8 @@
#include "d3d1xstutil.h"
#include "galliumd3d11.h"
#include <dxgi.h>
-#include <pipe/p_screen.h>
-#include <pipe/p_context.h>
+#include "pipe/p_screen.h"
+#include "pipe/p_context.h"
HRESULT D3D11CreateDevice(
IDXGIAdapter *adapter,
diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/d3d1x_private.h b/src/gallium/state_trackers/d3d1x/gd3d1x/d3d1x_private.h
index 977f0cd2ce..9d5d9c30b0 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d1x/d3d1x_private.h
+++ b/src/gallium/state_trackers/d3d1x/gd3d1x/d3d1x_private.h
@@ -43,14 +43,14 @@
extern "C"
{
-#include <pipe/p_defines.h>
-#include <pipe/p_screen.h>
-#include <pipe/p_context.h>
-#include <util/u_inlines.h>
-#include <util/u_format.h>
-#include <util/u_caps.h>
-#include <util/u_debug.h>
-#include <os/os_thread.h>
+#include "pipe/p_defines.h"
+#include "pipe/p_screen.h"
+#include "pipe/p_context.h"
+#include "util/u_inlines.h"
+#include "util/u_format.h"
+#include "util/u_caps.h"
+#include "util/u_debug.h"
+#include "os/os_thread.h"
}
#include "galliumdxgi.h"