From 900b5f4b793daca9b8ba2934d6783bdf79a59f0f Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 22 Oct 2012 14:36:31 +0200
Subject: [PATCH] winex11: Remove some remainders of the ddraw HAL support.

---
 dlls/winex11.drv/init.c     | 2 --
 dlls/winex11.drv/settings.c | 5 -----
 include/d3dhal.h            | 3 ---
 3 files changed, 10 deletions(-)

diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index a27b05280ac..f03dd4dd50b 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -311,8 +311,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
         {
             switch (*(const INT *)in_data)
             {
-            case DCICOMMAND:
-                return DD_HAL_VERSION;
             case X11DRV_ESCAPE:
                 return TRUE;
             }
diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
index 9512c64f1fb..035b0daef30 100644
--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -35,11 +35,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(x11settings);
 
-/*
- * The DDHALMODEINFO type is used to hold all the mode information.  
- * This is done because the array of DDHALMODEINFO structures must be 
- * created for use by DirectDraw anyway.
- */
 static struct x11drv_mode_info *dd_modes = NULL;
 static unsigned int dd_mode_count = 0;
 static unsigned int dd_max_modes = 0;
diff --git a/include/d3dhal.h b/include/d3dhal.h
index 6c68d4a03fd..9d43313a00b 100644
--- a/include/d3dhal.h
+++ b/include/d3dhal.h
@@ -47,9 +47,6 @@ typedef struct _D3DDeviceDesc_V1 {
   DWORD			dwMaxVertexCount;
 } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1;
 
-/* this is to allow keeping the bulk of our OpenGL code out of x11drv */
-#define D3DDD_WINE_OPENGL_DEVICE 0x00008000
-
 typedef struct _D3DHAL_GLOBALDRIVERDATA {
   DWORD			dwSize;
   D3DDEVICEDESC_V1	hwCaps;
-- 
2.11.4.GIT