From 95313a5fb027f649b4f7d810dd20857ecbb996f1 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 21 Dec 2013 19:11:16 +0000 Subject: [PATCH] [WINED3D] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61329 --- reactos/dll/directx/wine/wined3d/arb_program_shader.c | 6 ------ .../dll/directx/wine/wined3d/ati_fragment_shader.c | 6 ------ reactos/dll/directx/wine/wined3d/buffer.c | 3 --- reactos/dll/directx/wine/wined3d/context.c | 8 -------- reactos/dll/directx/wine/wined3d/device.c | 8 -------- reactos/dll/directx/wine/wined3d/directx.c | 6 ------ reactos/dll/directx/wine/wined3d/drawprim.c | 3 --- reactos/dll/directx/wine/wined3d/gl_compat.c | 8 -------- reactos/dll/directx/wine/wined3d/glsl_shader.c | 6 ------ .../dll/directx/wine/wined3d/nvidia_texture_shader.c | 5 ----- reactos/dll/directx/wine/wined3d/palette.c | 6 ------ reactos/dll/directx/wine/wined3d/query.c | 3 --- reactos/dll/directx/wine/wined3d/resource.c | 2 -- reactos/dll/directx/wine/wined3d/sampler.c | 3 --- reactos/dll/directx/wine/wined3d/shader.c | 7 ------- reactos/dll/directx/wine/wined3d/shader_sm1.c | 3 --- reactos/dll/directx/wine/wined3d/shader_sm4.c | 3 --- reactos/dll/directx/wine/wined3d/state.c | 8 -------- reactos/dll/directx/wine/wined3d/stateblock.c | 2 -- reactos/dll/directx/wine/wined3d/surface.c | 2 -- reactos/dll/directx/wine/wined3d/swapchain.c | 2 -- reactos/dll/directx/wine/wined3d/texture.c | 2 -- reactos/dll/directx/wine/wined3d/utils.c | 3 --- reactos/dll/directx/wine/wined3d/vertexdeclaration.c | 2 -- reactos/dll/directx/wine/wined3d/view.c | 3 --- reactos/dll/directx/wine/wined3d/volume.c | 2 -- reactos/dll/directx/wine/wined3d/wined3d_main.c | 4 ---- reactos/dll/directx/wine/wined3d/wined3d_private.h | 11 +++++++++-- 28 files changed, 9 insertions(+), 118 deletions(-) diff --git a/reactos/dll/directx/wine/wined3d/arb_program_shader.c b/reactos/dll/directx/wine/wined3d/arb_program_shader.c index caa18dc5c43..66c4640a12c 100644 --- a/reactos/dll/directx/wine/wined3d/arb_program_shader.c +++ b/reactos/dll/directx/wine/wined3d/arb_program_shader.c @@ -27,12 +27,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c index be679ddc555..0dd577441b1 100644 --- a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c +++ b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c @@ -18,12 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include -//#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/reactos/dll/directx/wine/wined3d/buffer.c b/reactos/dll/directx/wine/wined3d/buffer.c index 4e95fe2cc66..5a0f0abc8aa 100644 --- a/reactos/dll/directx/wine/wined3d/buffer.c +++ b/reactos/dll/directx/wine/wined3d/buffer.c @@ -22,9 +22,6 @@ * */ -#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/context.c b/reactos/dll/directx/wine/wined3d/context.c index 84b5b587c08..cfa5974216c 100644 --- a/reactos/dll/directx/wine/wined3d/context.c +++ b/reactos/dll/directx/wine/wined3d/context.c @@ -19,14 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include -#ifdef HAVE_FLOAT_H -# include -#endif - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/device.c b/reactos/dll/directx/wine/wined3d/device.c index d3d358c7fb2..84c4200dab4 100644 --- a/reactos/dll/directx/wine/wined3d/device.c +++ b/reactos/dll/directx/wine/wined3d/device.c @@ -24,14 +24,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include -#ifdef HAVE_FLOAT_H -# include -#endif - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/directx.c b/reactos/dll/directx/wine/wined3d/directx.c index ad9f549b410..2c104a82c1d 100644 --- a/reactos/dll/directx/wine/wined3d/directx.c +++ b/reactos/dll/directx/wine/wined3d/directx.c @@ -21,13 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -#include - #include "wined3d_private.h" -//#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); diff --git a/reactos/dll/directx/wine/wined3d/drawprim.c b/reactos/dll/directx/wine/wined3d/drawprim.c index 89f2d7a5dd5..4d0f59bd61d 100644 --- a/reactos/dll/directx/wine/wined3d/drawprim.c +++ b/reactos/dll/directx/wine/wined3d/drawprim.c @@ -24,9 +24,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); diff --git a/reactos/dll/directx/wine/wined3d/gl_compat.c b/reactos/dll/directx/wine/wined3d/gl_compat.c index 575743617d0..74ad048e857 100644 --- a/reactos/dll/directx/wine/wined3d/gl_compat.c +++ b/reactos/dll/directx/wine/wined3d/gl_compat.c @@ -18,14 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -#include -#ifdef HAVE_FLOAT_H -# include -#endif - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(gl_compat); diff --git a/reactos/dll/directx/wine/wined3d/glsl_shader.c b/reactos/dll/directx/wine/wined3d/glsl_shader.c index 5ff98dd8942..f2ec1d797ae 100644 --- a/reactos/dll/directx/wine/wined3d/glsl_shader.c +++ b/reactos/dll/directx/wine/wined3d/glsl_shader.c @@ -29,12 +29,6 @@ * mask for the destination parameter into account. */ -#include -#include - -//#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c index adf092523f1..7028c44921d 100644 --- a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c +++ b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c @@ -19,11 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include -//#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/palette.c b/reactos/dll/directx/wine/wined3d/palette.c index 43988da98c8..1239b15ca3b 100644 --- a/reactos/dll/directx/wine/wined3d/palette.c +++ b/reactos/dll/directx/wine/wined3d/palette.c @@ -18,12 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include -//#include "winerror.h" -//#include "wine/debug.h" - -//#include #include "wined3d_private.h" diff --git a/reactos/dll/directx/wine/wined3d/query.c b/reactos/dll/directx/wine/wined3d/query.c index 1d280c88f57..8806c9a4e9d 100644 --- a/reactos/dll/directx/wine/wined3d/query.c +++ b/reactos/dll/directx/wine/wined3d/query.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/resource.c b/reactos/dll/directx/wine/wined3d/resource.c index ff8e8b4983a..a3fc9d00638 100644 --- a/reactos/dll/directx/wine/wined3d/resource.c +++ b/reactos/dll/directx/wine/wined3d/resource.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/sampler.c b/reactos/dll/directx/wine/wined3d/sampler.c index 06e3a31f453..d82c4c90aa7 100644 --- a/reactos/dll/directx/wine/wined3d/sampler.c +++ b/reactos/dll/directx/wine/wined3d/sampler.c @@ -17,9 +17,6 @@ * */ -#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/shader.c b/reactos/dll/directx/wine/wined3d/shader.c index 43a9bbe794f..de86bc1f138 100644 --- a/reactos/dll/directx/wine/wined3d/shader.c +++ b/reactos/dll/directx/wine/wined3d/shader.c @@ -22,13 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include -#include -//#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/reactos/dll/directx/wine/wined3d/shader_sm1.c b/reactos/dll/directx/wine/wined3d/shader_sm1.c index 6ccf11106dc..da6641d8c9b 100644 --- a/reactos/dll/directx/wine/wined3d/shader_sm1.c +++ b/reactos/dll/directx/wine/wined3d/shader_sm1.c @@ -22,9 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/reactos/dll/directx/wine/wined3d/shader_sm4.c b/reactos/dll/directx/wine/wined3d/shader_sm4.c index 5f4d7694f6f..c09d0bbab24 100644 --- a/reactos/dll/directx/wine/wined3d/shader_sm4.c +++ b/reactos/dll/directx/wine/wined3d/shader_sm4.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/reactos/dll/directx/wine/wined3d/state.c b/reactos/dll/directx/wine/wined3d/state.c index f1c5d8ab6e3..784907a72f9 100644 --- a/reactos/dll/directx/wine/wined3d/state.c +++ b/reactos/dll/directx/wine/wined3d/state.c @@ -25,14 +25,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include -#ifdef HAVE_FLOAT_H -# include -#endif - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/stateblock.c b/reactos/dll/directx/wine/wined3d/stateblock.c index 1115544e2c2..9cb336d5f1e 100644 --- a/reactos/dll/directx/wine/wined3d/stateblock.c +++ b/reactos/dll/directx/wine/wined3d/stateblock.c @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/surface.c b/reactos/dll/directx/wine/wined3d/surface.c index 97e5541488d..ddf4cbf74f0 100644 --- a/reactos/dll/directx/wine/wined3d/surface.c +++ b/reactos/dll/directx/wine/wined3d/surface.c @@ -26,8 +26,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); diff --git a/reactos/dll/directx/wine/wined3d/swapchain.c b/reactos/dll/directx/wine/wined3d/swapchain.c index 4996cf5fa13..f0d7fbee297 100644 --- a/reactos/dll/directx/wine/wined3d/swapchain.c +++ b/reactos/dll/directx/wine/wined3d/swapchain.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/texture.c b/reactos/dll/directx/wine/wined3d/texture.c index 6137a77e5aa..d670ce8ac86 100644 --- a/reactos/dll/directx/wine/wined3d/texture.c +++ b/reactos/dll/directx/wine/wined3d/texture.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); diff --git a/reactos/dll/directx/wine/wined3d/utils.c b/reactos/dll/directx/wine/wined3d/utils.c index 16358aca431..52580dcf545 100644 --- a/reactos/dll/directx/wine/wined3d/utils.c +++ b/reactos/dll/directx/wine/wined3d/utils.c @@ -24,9 +24,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/vertexdeclaration.c b/reactos/dll/directx/wine/wined3d/vertexdeclaration.c index 4a36325922e..1ffd3b9befe 100644 --- a/reactos/dll/directx/wine/wined3d/vertexdeclaration.c +++ b/reactos/dll/directx/wine/wined3d/vertexdeclaration.c @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); diff --git a/reactos/dll/directx/wine/wined3d/view.c b/reactos/dll/directx/wine/wined3d/view.c index ef0896e8757..bc579e37750 100644 --- a/reactos/dll/directx/wine/wined3d/view.c +++ b/reactos/dll/directx/wine/wined3d/view.c @@ -17,9 +17,6 @@ * */ -#include -#include - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/volume.c b/reactos/dll/directx/wine/wined3d/volume.c index 88a1e226c4f..df8e5e49b4b 100644 --- a/reactos/dll/directx/wine/wined3d/volume.c +++ b/reactos/dll/directx/wine/wined3d/volume.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); diff --git a/reactos/dll/directx/wine/wined3d/wined3d_main.c b/reactos/dll/directx/wine/wined3d/wined3d_main.c index 56d45d299c0..225723abb2f 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d_main.c +++ b/reactos/dll/directx/wine/wined3d/wined3d_main.c @@ -22,10 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include -#include - -//#include "initguid.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/reactos/dll/directx/wine/wined3d/wined3d_private.h b/reactos/dll/directx/wine/wined3d/wined3d_private.h index db075cc4f72..d425a5edd6a 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d_private.h +++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h @@ -25,6 +25,9 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H +#include +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -35,14 +38,18 @@ #define WINE_GLAPI #endif +#ifdef HAVE_FLOAT_H +# include +#endif + #include +#include #include -//#include #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS #include -//#include "winbase.h" +#include #include #include #include