From: Kai Wasserbäch Date: Sat, 27 Aug 2011 15:51:53 +0000 (+0200) Subject: d3d1x: Fix include style X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92bc1111f3c5dd3616bd591129aebd3f4307e5b4;p=mesa.git 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] Signed-off-by: Kai Wasserbäch Signed-off-by: Brian Paul --- diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h index af355f02272..e197c0ca797 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 -#include -#include +#include "util/u_atomic.h" +#include "pipe/p_format.h" +#include "os/os_thread.h" } #include 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 0bb9d852f84..0c80738b7ab 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 -#include -#include -#include +#include "util/u_format.h" +#include "util/u_inlines.h" +#include "util/u_simple_shaders.h" +#include "pipe/p_shader_tokens.h" } #include #include diff --git a/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp b/src/gallium/state_trackers/d3d1x/dxgid3d10/dxgid3d10.cpp index 96073d4ebc6..cdc5df4b918 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 -#include -#include +#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 1b1cb907d37..b93ffb2040d 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 -#include -#include +#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 977f0cd2cea..9d5d9c30b06 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 -#include -#include -#include -#include -#include -#include -#include +#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"