From f442bafb8a84ce819b7498d165dd649c8fe78bbc Mon Sep 17 00:00:00 2001 From: Vincent Pelletier Date: Sat, 22 Nov 2008 00:54:46 +0100 Subject: [PATCH] wined3d: Add detection for NVIDIA's GTX 280. --- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index effc9eb5d9b..e096c869720 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1074,8 +1074,13 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ if(WINE_D3D9_CAPABLE(gl_info) && (gl_info->vs_nv_version == VS_VERSION_30)) { + /* Geforce GTX - highend */ + if(strstr(gl_info->gl_renderer, "GTX 280")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX280; + vidmem = 1024; + } /* Geforce9 - highend */ - if(strstr(gl_info->gl_renderer, "9800")) { + else if(strstr(gl_info->gl_renderer, "9800")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800GT; vidmem = 512; } @@ -3847,6 +3852,7 @@ static const struct driver_version_information driver_version_table[] = { {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, 7, 15, 11, 7341 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, 7, 15, 11, 7341 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode */ {VENDOR_ATI, CARD_ATI_RADEON_9500, 6, 14, 10, 6764 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4dba7d2c55b..0dababca29e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3254,6 +3254,7 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, + CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,