Jaime Rave : wined3d: Added Intel GM45 video card detection.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6bf3f67c018259e1c87189dcef31816023bd2e48
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6bf3f67c018259e1c87189dcef...

Author: Jaime Rave <jaimerave(a)ubuntu-co.com>
Date:   Wed Nov 10 00:32:33 2010 -0500

wined3d: Added Intel GM45 video card detection.

---

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

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 4485491..d1ef660 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1114,7 +1114,8 @@ static const struct gpu_description gpu_description_table[] =
     {HW_VENDOR_INTEL,      CARD_INTEL_I915G,               "Intel(R) 82915G/GV/910GL Express Chipset Family",           DRIVER_INTEL_GMA900,  64 },
     {HW_VENDOR_INTEL,      CARD_INTEL_I915GM,              "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family",   DRIVER_INTEL_GMA900,  64 },
     {HW_VENDOR_INTEL,      CARD_INTEL_I945GM,              "Mobile Intel(R) 945GM Express Chipset Family",              DRIVER_INTEL_GMA950,  64 },
-    {HW_VENDOR_INTEL,      CARD_INTEL_X3100,               "Mobile Intel(R) 965 Express Chipset Family",                DRIVER_INTEL_GMA3000, 128}
+    {HW_VENDOR_INTEL,      CARD_INTEL_X3100,               "Mobile Intel(R) 965 Express Chipset Family",                DRIVER_INTEL_GMA3000, 128},
+    {HW_VENDOR_INTEL,      CARD_INTEL_GM45,                "Mobile Intel(R) GM45 Express Chipset Family",               DRIVER_INTEL_GMA3000, 512}
 };
 
 static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,
@@ -1692,6 +1693,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in
 static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info,
         const char *gl_renderer)
 {
+    if (strstr(gl_renderer, "GM45")) return CARD_INTEL_GM45;
     if (strstr(gl_renderer, "X3100") || strstr(gl_renderer, "965GM"))
     {
         /* MacOS calls the card GMA X3100, otherwise known as GM965/GL960 */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8f6c96e..badd3bb 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1410,6 +1410,7 @@ enum wined3d_pci_device
     CARD_INTEL_I915GM               = 0x2592,
     CARD_INTEL_I945GM               = 0x27a2, /* Same as GMA 950? */
     CARD_INTEL_X3100                = 0x2a02, /* Found in Macs. Same as GM965/GL960 */
+    CARD_INTEL_GM45                 = 0x2a42,
 };
 
 struct wined3d_fbo_ops