Moved d3ddevice and direct3d objects files to ddraw root dir.

Renamed all remaining files.

configure

@@ -20049,10 +20049,6 @@ esac
 
 
 
-          ac_config_commands="$ac_config_commands dlls/ddraw/d3ddevice"
-
-          ac_config_commands="$ac_config_commands dlls/ddraw/direct3d"
-
           ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv"
 
           ac_config_commands="$ac_config_commands dlls/gdi/mfdrv"
@@ -20878,8 +20874,6 @@ do
   "tools/winegcc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/winegcc/Makefile" ;;
   "tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;;
   "tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;;
-  "dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;;
-  "dlls/ddraw/direct3d" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/direct3d" ;;
   "dlls/gdi/enhmfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;;
   "dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;;
   "dlls/kernel/messages" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/messages" ;;
@@ -21670,10 +21664,6 @@ esac
   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
 echo "$as_me: executing $ac_dest commands" >&6;}
   case $ac_dest in
-    dlls/ddraw/d3ddevice ) test -d "dlls/ddraw/d3ddevice" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/d3ddevice" >&5
-echo "$as_me: creating dlls/ddraw/d3ddevice" >&6;} && mkdir "dlls/ddraw/d3ddevice") ;;
-    dlls/ddraw/direct3d ) test -d "dlls/ddraw/direct3d" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/direct3d" >&5
-echo "$as_me: creating dlls/ddraw/direct3d" >&6;} && mkdir "dlls/ddraw/direct3d") ;;
     dlls/gdi/enhmfdrv ) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5
 echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;;
     dlls/gdi/mfdrv ) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5

configure.ac

@@ -1507,8 +1507,6 @@ dnl **** Generate output files ****
 
 AH_TOP([#define __WINE_CONFIG_H])
 
-WINE_CONFIG_EXTRA_DIR(dlls/ddraw/d3ddevice)
-WINE_CONFIG_EXTRA_DIR(dlls/ddraw/direct3d)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)

dlls/ddraw/Makefile.in

@@ -9,18 +9,18 @@ EXTRAINCL = @X_CFLAGS@
 EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ 
 
 OPENGLFILES = \
-	d3dcommon.c \
-	d3ddevice/main.c \
-	d3ddevice/mesa.c \
-	d3dexecutebuffer.c \
-	d3dlight.c \
-	d3dmaterial.c \
-	d3dtexture.c \
-	d3dvertexbuffer.c \
-	d3dviewport.c \
-	direct3d/main.c \
-	direct3d/mesa.c \
-	mesa.c
+	d3d_utils.c \
+	device_main.c \
+	device_opengl.c \
+	direct3d_main.c \
+	direct3d_opengl.c \
+	executebuffer.c \
+	light.c \
+	material.c \
+	opengl_utils.c \
+	texture.c \
+	vertexbuffer.c \
+	viewport.c
 
 C_SRCS = \
 	@OPENGLFILES@ \
@@ -47,10 +47,6 @@ RC_SRCS = version.rc
 
 SUBDIRS = tests
 
-EXTRASUBDIRS = \
-	d3ddevice \
-	direct3d
-
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/ddraw/ddraw_main.c

@@ -67,7 +67,7 @@
 #include "wine/debug.h"
 
 #include "ddraw_private.h"
-#include "mesa_private.h" /* To have the D3D creation function */
+#include "opengl_private.h" /* To have the D3D creation function */
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

dlls/ddraw/device_opengl.c

@@ -43,7 +43,7 @@
 #include "wine/library.h"
 
 #include "d3d_private.h"
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom);

dlls/ddraw/direct3d_opengl.c

@@ -42,7 +42,7 @@
 
 #include "ddraw_private.h"
 #include "d3d_private.h"
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 #include "wine/debug.h"
 

dlls/ddraw/executebuffer.c

@@ -39,7 +39,7 @@
 #include "wine/debug.h"
 
 #include "d3d_private.h"
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom);

dlls/ddraw/light.c

@@ -37,7 +37,7 @@
 #include "wine/debug.h"
 
 #include "d3d_private.h"
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

dlls/ddraw/main.c

@@ -73,7 +73,7 @@ BOOL opengl_initialized = 0;
 
 #ifdef HAVE_OPENGL
 
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 static void *gl_handle = NULL;
 

dlls/ddraw/material.c

@@ -37,7 +37,7 @@
 #include "wine/debug.h"
 
 #include "d3d_private.h"
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

dlls/ddraw/opengl_utils.c

@@ -32,7 +32,7 @@
 #include "d3d.h"
 #include "wine/debug.h"
 
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 

dlls/ddraw/surface_main.c

@@ -30,9 +30,9 @@
 #define NONAMELESSSTRUCT
 
 #include "winerror.h"
-#include "mesa_private.h"
 #include "wine/debug.h"
 #include "ddraw_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 WINE_DECLARE_DEBUG_CHANNEL(ddraw_flip);

dlls/ddraw/texture.c

@@ -37,7 +37,7 @@
 #include "d3d.h"
 #include "wine/debug.h"
 
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 WINE_DECLARE_DEBUG_CHANNEL(ddraw_tex);

dlls/ddraw/vertexbuffer.c

@@ -33,7 +33,7 @@
 #include "wine/debug.h"
 
 #include "d3d_private.h"
-#include "mesa_private.h"
+#include "opengl_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom);