[PATCH 4/4] wined3d: add Intel driver/gpu info

[Roderick Colenbrander]

---
 dlls/wined3d/directx.c         |   32 +++++++++++++++++++++++++++++---
 dlls/wined3d/wined3d_private.h |    4 ++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index f4676be..d3a2bdb 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1007,6 +1007,23 @@ static const struct driver_version_information driver_version_table[] =
     {HW_VENDOR_ATI,     6,  1,  DRIVER_ATI_R300,            "atiumdag.dll", 8,  14, 10, 741 },
     {HW_VENDOR_ATI,     6,  1,  DRIVER_ATI_R600,            "atiumdag.dll", 8,  14, 10, 741 },
 
+    /* Intel
+     * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp
+     * drivers used ialmrnt5.dll for GMA800/GMA900 but at some point the file was renamed to
+     * igxprd32.dll but the GMA800 driver was never updated. */
+    {HW_VENDOR_INTEL,    5, 0,  DRIVER_INTEL_GMA800,        "ialmrnt5.dll", 5,  14, 10, 3889},
+    {HW_VENDOR_INTEL,    5, 0,  DRIVER_INTEL_GMA900,        "igxprd32.dll", 5,  14, 10, 4764},
+    {HW_VENDOR_INTEL,    5, 0,  DRIVER_INTEL_GMA950,        "igxprd32.dll", 5,  14, 10, 4926},
+    {HW_VENDOR_INTEL,    5, 0,  DRIVER_INTEL_GMA3000,       "igxprd32.dll", 5,  14, 10, 5218},
+    {HW_VENDOR_INTEL,    5, 1,  DRIVER_INTEL_GMA800,        "ialmrnt5.dll", 6,  14, 10, 3889},
+    {HW_VENDOR_INTEL,    5, 1,  DRIVER_INTEL_GMA900,        "igxprd32.dll", 6,  14, 10, 4764},
+    {HW_VENDOR_INTEL,    5, 1,  DRIVER_INTEL_GMA950,        "igxprd32.dll", 6,  14, 10, 4926},
+    {HW_VENDOR_INTEL,    5, 1,  DRIVER_INTEL_GMA3000,       "igxprd32.dll", 6,  14, 10, 5218},
+    {HW_VENDOR_INTEL,    6, 0,  DRIVER_INTEL_GMA950,        "igdumd32.dll", 7,  14, 10, 1504},
+    {HW_VENDOR_INTEL,    6, 0,  DRIVER_INTEL_GMA3000,       "igdumd32.dll", 7,  15, 10, 1666},
+    {HW_VENDOR_INTEL,    6, 1,  DRIVER_INTEL_GMA950,        "igdumd32.dll", 8,  14, 10, 1504},
+    {HW_VENDOR_INTEL,    6, 1,  DRIVER_INTEL_GMA3000,       "igdumd32.dll", 8,  15, 10, 1666},
+
     /* Nvidia
      * - Geforce6 and newer cards are supported by the current driver (197.x) on XP-Win7
      * - GeforceFX support is up to 173.x on <= XP
@@ -1090,9 +1107,18 @@ static const struct gpu_description gpu_description_table[] =
     {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD4700,         "ATI Radeon HD 4700 Series",        DRIVER_ATI_R600,         },
     {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD4800,         "ATI Radeon HD 4800 Series",        DRIVER_ATI_R600,         },
     {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD5700,         "ATI Radeon HD 5700 Series",        DRIVER_ATI_R600,         },
-    {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD5800,         "ATI Radeon HD 5800 Series",        DRIVER_ATI_R600,         }
-
-    /* TODO: Add information about legacy ATI hardware, Intel and other cards. */
+    {HW_VENDOR_ATI,        CARD_ATI_RADEON_HD5800,         "ATI Radeon HD 5800 Series",        DRIVER_ATI_R600,         },
+
+    /* Intel cards */
+    {HW_VENDOR_INTEL,      CARD_INTEL_I830G,               "Intel(R) 82830M Graphics Controller",                       DRIVER_INTEL_GMA800  },
+    {HW_VENDOR_INTEL,      CARD_INTEL_I855G,               "Intel(R) 82852/82855 GM/GME Graphics Controller",           DRIVER_INTEL_GMA800  },
+    {HW_VENDOR_INTEL,      CARD_INTEL_I865G,               "Intel(R) 82865G Graphics Controller",                       DRIVER_INTEL_GMA800  },
+    {HW_VENDOR_INTEL,      CARD_INTEL_I915G,               "Intel(R) 82915G/GV/910GL Express Chipset Family",           DRIVER_INTEL_GMA900  },
+    {HW_VENDOR_INTEL,      CARD_INTEL_I915GM,              "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family",   DRIVER_INTEL_GMA900  },
+    {HW_VENDOR_INTEL,      CARD_INTEL_I945GM,              "Mobile Intel(R) 945GM Express Chipset Family",              DRIVER_INTEL_GMA950  },
+    {HW_VENDOR_INTEL,      CARD_INTEL_X3100,               "Mobile Intel(R) 965 Express Chipset Family",                DRIVER_INTEL_GMA3000 }
+
+    /* TODO: Add information about legacy ATI hardware and other cards. */
 };
 
 static void init_driver_info(struct wined3d_driver_info *driver_info,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8bc2b16..6a6978b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1232,6 +1232,10 @@ enum wined3d_display_driver
 {
     DRIVER_ATI_R300,
     DRIVER_ATI_R600,
+    DRIVER_INTEL_GMA800,
+    DRIVER_INTEL_GMA900,
+    DRIVER_INTEL_GMA950,
+    DRIVER_INTEL_GMA3000,
     DRIVER_NVIDIA_TNT,
     DRIVER_NVIDIA_GEFORCE2MX,
     DRIVER_NVIDIA_GEFORCEFX,
-- 
1.7.0.4