wined3d: Updated NVIDIA mobile GT GPUs

[Roderick Colenbrander]

Hi,

In order to not let the card database become too long I group a lot of
boards together. That should be doable for the 96xx / 97xx / 98xx
boards you added below and then I use the lowest number of video
memory (512MB). This should be fine for apps as they only need a
reasonable estimate of the card. Further we can't use all video memory
anyway. In the near future I plan to add a better mechanism which will
detect the actual card using nv-control.

Roderick

2009/5/13 Łukasz Wojniłowicz <lukasz.wojnilowicz at gmail.com>:
> ---
>  dlls/wined3d/directx.c    |   42 ++++++++++++++++++++++++++++++++++++++++++
>  dlls/wined3d/wined3d_gl.h |    7 +++++++
>  2 files changed, 49 insertions(+), 0 deletions(-)
>
> diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
> index f5d4d3e..989ab7f 100644
> --- a/dlls/wined3d/directx.c
> +++ b/dlls/wined3d/directx.c
> @@ -1112,11 +1112,46 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
>                     gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800GT;
>                     vidmem = 512;
>                 }
> +                /* Geforce9800M GTX - highend */
> +                else if(strstr(gl_info->gl_renderer, "9800M GTX")) {
> +                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800MGTX;
> +                    vidmem = 1024; /* The 9800M GTX has 1024MB */
> +                }
> +                /* Geforce9800M GTS - highend */
> +                else if(strstr(gl_info->gl_renderer, "9800M GTS")) {
> +                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800MGTS;
> +                    vidmem = 1024; /* The 9800M GTS has 1024MB */
> +                }
> +                /* Geforce9800M GT - highend */
> +                else if(strstr(gl_info->gl_renderer, "9800M GT")) {
> +                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_9800MGT;
> +                    vidmem = 512; /* The 9800M GT has 512MB */
> +                }
>                 /* Geforce9 - midend */
>                 else if(strstr(gl_info->gl_renderer, "9600")) {
>                     gl_info->gl_card = CARD_NVIDIA_GEFORCE_9600GT;
>                     vidmem = 384; /* The 9600GSO has 384MB, the 9600GT has 512-1024MB */
>                 }
> +                /* Geforce9700M GTS - midend */
> +                else if(strstr(gl_info->gl_renderer, "9700M GTS")) {
> +                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_9700MGTS;
> +                    vidmem = 512; /* The 9700M GTS has 512MB */
> +                }
> +                /* Geforce9700M GT - midend */
> +                else if(strstr(gl_info->gl_renderer, "9700M GT")) {
> +                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_9700MGT;
> +                    vidmem = 512; /* The 9700M GT has 512MB */
> +                }
> +                /* Geforce9650M GT - midend */
> +                else if(strstr(gl_info->gl_renderer, "9650M GT")) {
> +                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_9650MGT;
> +                    vidmem = 512; /* The 9650M GT has 512-1024MB */
> +                }
> +                /* Geforce9600M GT - midend */
> +                else if(strstr(gl_info->gl_renderer, "9600M GT")) {
> +                    gl_info->gl_card = CARD_NVIDIA_GEFORCE_9600MGT;
> +                    vidmem = 512; /* The 9600M GT has 512-1024MB */
> +                }
>                 /* Geforce9 - midend low / Geforce 200 - low*/
>                 else if(strstr(gl_info->gl_renderer, "9500") ||
>                         strstr(gl_info->gl_renderer, "GT 120") ||
> @@ -3991,7 +4026,14 @@ static const struct driver_version_information driver_version_table[] = {
>     {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9400GT,     "NVIDIA GeForce 9400 GT",           7,  15, 11, 8044   },
>     {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9500GT,     "NVIDIA GeForce 9500 GT",           7,  15, 11, 8044   },
>     {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9600GT,     "NVIDIA GeForce 9600 GT",           7,  15, 11, 8044   },
> +    {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9600MGT,    "NVIDIA GeForce 9600M GT",          7,  15, 11, 8044   },
> +    {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9650MGT,    "NVIDIA GeForce 9650M GT",          7,  15, 11, 8044   },
> +    {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9700MGT,    "NVIDIA GeForce 9700M GT",          7,  15, 11, 8044   },
> +    {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9700MGTS,   "NVIDIA GeForce 9700M GTS",         7,  15, 11, 8044   },
>     {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9800GT,     "NVIDIA GeForce 9800 GT",           7,  15, 11, 8044   },
> +    {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9800MGT,    "NVIDIA GeForce 9800M GT",          7,  15, 11, 8044   },
> +    {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9800MGTS,   "NVIDIA GeForce 9800M GTS",         7,  15, 11, 8044   },
> +    {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_9800MGTX,   "NVIDIA GeForce 9800M GTX",         7,  15, 11, 8044   },
>     {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTX260,     "NVIDIA GeForce GTX 260",           7,  15, 11, 8044   },
>     {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTX275,     "NVIDIA GeForce GTX 275",           7,  15, 11, 8044   },
>     {VENDOR_NVIDIA,     CARD_NVIDIA_GEFORCE_GTX280,     "NVIDIA GeForce GTX 280",           7,  15, 11, 8044   },
> diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
> index 1a9c925..4f3542d 100644
> --- a/dlls/wined3d/wined3d_gl.h
> +++ b/dlls/wined3d/wined3d_gl.h
> @@ -3330,7 +3330,14 @@ typedef enum _GL_Cards {
>   CARD_NVIDIA_GEFORCE_9400GT      = 0x042c,
>   CARD_NVIDIA_GEFORCE_9500GT      = 0x0640,
>   CARD_NVIDIA_GEFORCE_9600GT      = 0x0622,
> +  CARD_NVIDIA_GEFORCE_9600MGT     = 0x0649,
> +  CARD_NVIDIA_GEFORCE_9650MGT     = 0x064C,
> +  CARD_NVIDIA_GEFORCE_9700MGT     = 0x064A,
> +  CARD_NVIDIA_GEFORCE_9700MGTS    = 0x062A,
>   CARD_NVIDIA_GEFORCE_9800GT      = 0x0614,
> +  CARD_NVIDIA_GEFORCE_9800MGT     = 0x060B,
> +  CARD_NVIDIA_GEFORCE_9800MGTS    = 0x0628,
> +  CARD_NVIDIA_GEFORCE_9800MGTX    = 0x0608,
>   CARD_NVIDIA_GEFORCE_GTX260      = 0x05e2,
>   CARD_NVIDIA_GEFORCE_GTX275      = 0x05e6,
>   CARD_NVIDIA_GEFORCE_GTX280      = 0x05e1,
> --
> 1.6.0.6
>
>
>
>