Roderick Colenbrander : wined3d: Separate AMD GPUs in D3D9 and D3D10 models , this allows for a more correct fall back when the GPU table isn' t up to date.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3b993117c3d60edd033ee2494082a12c5d3c131c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b993117c3d60edd033ee24940...

Author: Roderick Colenbrander <thunderbird2k(a)gmail.com>
Date:   Fri Apr 16 08:49:41 2010 +0200

wined3d: Separate AMD GPUs in D3D9 and D3D10 models, this allows for a more correct fall back when the GPU table isn't up to date.

D3D10_CAPABLE should work on any AMD OpenGL 3.0 driver (those came out in september 2008) and on OSX 10.5 and up.

---

 dlls/wined3d/directx.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 7e22dbc..8fb0f21 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1506,7 +1506,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in
      *
      * Beware: renderer string do not match exact card model,
      * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */
-    if (WINE_D3D9_CAPABLE(gl_info))
+    if (WINE_D3D10_CAPABLE(gl_info))
     {
         /* Radeon EG CYPRESS XT / PRO HD5800 - highend */
         if (strstr(gl_renderer, "HD 5800")          /* Radeon EG CYPRESS HD58xx generic renderer string */
@@ -1603,6 +1603,13 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in
             return CARD_ATI_RADEON_HD3200;
         }
 
+        /* Default for when no GPU has been found */
+        *vidmem = 128; /* 128MB */
+        return CARD_ATI_RADEON_HD3200;
+    }
+
+    if (WINE_D3D8_CAPABLE(gl_info))
+    {
         /* Radeon R5xx */
         if (strstr(gl_renderer, "X1600")
                 || strstr(gl_renderer, "X1650")