Roderick Colenbrander : wined3d: Update list of pci ids.

[Alexandre Julliard]

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

Author: Roderick Colenbrander <thunderbird2k at gmx.net>
Date:   Sun Sep 16 13:08:54 2007 +0200

wined3d: Update list of pci ids.

---

 dlls/wined3d/directx.c    |   34 ++++++++++++++++++++++++----------
 include/wine/wined3d_gl.h |    3 +++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 3eaff3d..8560e98 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -836,14 +836,15 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
                         strstr(gl_info->gl_renderer, "Quadro FX 5"))
                             gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800GT;
                 else if(strstr(gl_info->gl_renderer, "6800") ||
-                        strstr(gl_info->gl_renderer, "7600"))
+                        strstr(gl_info->gl_renderer, "7600") ||
+                        strstr(gl_info->gl_renderer, "7700"))
                             gl_info->gl_card = CARD_NVIDIA_GEFORCE_6800;
                 else if(strstr(gl_info->gl_renderer, "6600") ||
                         strstr(gl_info->gl_renderer, "6610") ||
                         strstr(gl_info->gl_renderer, "6700"))
                             gl_info->gl_card = CARD_NVIDIA_GEFORCE_6600GT;
                 else
-                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_6200; /* Geforce 6100/6150/6200/7300/7400 */
+                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_6200; /* Geforce 6100/6150/6200/7300/7400/7500 */
             } else if(WINE_D3D9_CAPABLE(gl_info)) {
                 if (strstr(gl_info->gl_renderer, "5800") ||
                     strstr(gl_info->gl_renderer, "5900") ||
@@ -880,18 +881,31 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
             break;
         case VENDOR_ATI:
             if(WINE_D3D9_CAPABLE(gl_info)) {
+                /* Radeon R6xx HD2900 - highend */
+                if (strstr(gl_info->gl_renderer, "HD 2900"))
+                    gl_info->gl_card = CARD_ATI_RADEON_HD2900;
+                /* Radeon R6xx HD2600- midend */
+                else if (strstr(gl_info->gl_renderer, "HD 2600"))
+                    gl_info->gl_card = CARD_ATI_RADEON_HD2600;
+                /* Radeon R6xx HD2300/HD2400 - lowend */
+                else if (strstr(gl_info->gl_renderer, "HD 2300") ||
+                         strstr(gl_info->gl_renderer, "HD 2400"))
+                             gl_info->gl_card = CARD_ATI_RADEON_HD2300;
                 /* Radeon R5xx */
-                if (strstr(gl_info->gl_renderer, "X1600") ||
-                    strstr(gl_info->gl_renderer, "X1800") ||
-                    strstr(gl_info->gl_renderer, "X1900") ||
-                    strstr(gl_info->gl_renderer, "X1950"))
-                        gl_info->gl_card = CARD_ATI_RADEON_X1600;
-                /* Radeon R4xx + X1300/X1400 (lowend R5xx) */
+                else if (strstr(gl_info->gl_renderer, "X1600") ||
+                         strstr(gl_info->gl_renderer, "X1650") ||
+                         strstr(gl_info->gl_renderer, "X1800") ||
+                         strstr(gl_info->gl_renderer, "X1900") ||
+                         strstr(gl_info->gl_renderer, "X1950"))
+                             gl_info->gl_card = CARD_ATI_RADEON_X1600;
+                /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300 (lowend R5xx) */
                 else if(strstr(gl_info->gl_renderer, "X700") ||
                         strstr(gl_info->gl_renderer, "X800") ||
                         strstr(gl_info->gl_renderer, "X850") ||
                         strstr(gl_info->gl_renderer, "X1300") ||
-                        strstr(gl_info->gl_renderer, "X1400"))
+                        strstr(gl_info->gl_renderer, "X1400") ||
+                        strstr(gl_info->gl_renderer, "X1450") ||
+                        strstr(gl_info->gl_renderer, "X1550"))
                             gl_info->gl_card = CARD_ATI_RADEON_X700;
                 /* Radeon R3xx */ 
                 else
@@ -929,7 +943,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
             if(WINE_D3D9_CAPABLE(gl_info))
                 gl_info->gl_card = CARD_NVIDIA_GEFORCEFX_5600;
             else if(WINE_D3D8_CAPABLE(gl_info))
-                gl_info->gl_card = CARD_NVIDIA_GEFORCE3;            
+                gl_info->gl_card = CARD_NVIDIA_GEFORCE3;
             else if(WINE_D3D7_CAPABLE(gl_info))
                 gl_info->gl_card = CARD_NVIDIA_GEFORCE;
             else if(WINE_D3D6_CAPABLE(gl_info))
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h
index 18ddf6a..ab17169 100644
--- a/include/wine/wined3d_gl.h
+++ b/include/wine/wined3d_gl.h
@@ -3069,6 +3069,9 @@ typedef enum _GL_Cards {
   CARD_ATI_RADEON_9500            = 0x4144,
   CARD_ATI_RADEON_X700            = 0x5e4c,
   CARD_ATI_RADEON_X1600           = 0x71c2,
+  CARD_ATI_RADEON_HD2300          = 0x7210,
+  CARD_ATI_RADEON_HD2600          = 0x9581,
+  CARD_ATI_RADEON_HD2900          = 0x9400,
 
   CARD_NVIDIA_RIVA_128            = 0x0018,
   CARD_NVIDIA_RIVA_TNT            = 0x0020,