From 28170c144046d51ee77f1701f8eab36ed89610cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Fri, 23 Nov 2007 01:53:02 +0100 Subject: [PATCH] wined3d: Report some more geforce 7 cards as geforce 7. --- dlls/wined3d/directx.c | 16 ++++++++++++---- include/wine/wined3d_gl.h | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 36d7ebcfe8..3bc5712517 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -968,10 +968,18 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800GT; vidmem = 256; /* A 7800GT uses 256MB while highend 7900 cards can use 512MB */ } - /* Geforce7 midend / Geforce6 highend */ - else if(strstr(gl_info->gl_renderer, "6800") || - strstr(gl_info->gl_renderer, "7600") || - strstr(gl_info->gl_renderer, "7700")) + /* Geforce7 midend */ + else if(strstr(gl_info->gl_renderer, "7600") || + strstr(gl_info->gl_renderer, "7700")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_7600; + vidmem = 256; /* The 7600 uses 256-512MB */ + /* Geforce7 lower medium */ + } else if(strstr(gl_info->gl_renderer, "7400")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_7400; + vidmem = 256; /* The 7400 uses 256-512MB */ + } + /* Geforce6 highend */ + else if(strstr(gl_info->gl_renderer, "6800")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_6800; vidmem = 128; /* The 6800 uses 128-256MB, the 7600 uses 256-512MB */ diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index b3460640d6..36ebd90ede 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3102,6 +3102,8 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_6200 = 0x014f, CARD_NVIDIA_GEFORCE_6600GT = 0x0140, CARD_NVIDIA_GEFORCE_6800 = 0x0041, + CARD_NVIDIA_GEFORCE_7400 = 0x01d8, + CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, CARD_NVIDIA_GEFORCE_8300GS = 0x0423, CARD_NVIDIA_GEFORCE_8600GT = 0x0402,