Re: [Patch] for wined3d: Correcting order issue

[Roderick Colenbrander]

> Hi all,
>
> This patch repairs my previous one, as the command never got executed,
> because 8600 matches before 8600M.
>
> Marco Schuster
>
> diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
> index e4b5bdf..50b3250 100644
> --- a/dlls/wined3d/directx.c
> +++ b/dlls/wined3d/directx.c
> @@ -950,6 +950,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info
> *gl_info) {
>                      gl_info->gl_card = CARD_NVIDIA_GEFORCE_8800GTS;
>                      vidmem = 320; /* The 8800GTS uses 320MB, a 8800GTX
> can have 768MB */
>                  }
> -
>            /* Geforce8 - midend mobile */
> -
>            else if(strstr(gl_info->gl_renderer, "8600 M")) {
> -
>                gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600MGT;
> -
>                vidmem = 512;
> -
>            }
>            /* Geforce8 - midend */
>            else if(strstr(gl_info->gl_renderer, "8600") ||
>                    strstr(gl_info->gl_renderer, "8700"))
>
> @@ -957,11 +962,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info
> *gl_info) {
>                      gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600GT;
>                      vidmem = 256;
>                  }
> -
>            /* Geforce8 - midend mobile */
> -
>            else if(strstr(gl_info->gl_renderer, "8600 M")) {
> -
>                gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600MGT;
> -
>                vidmem = 512;
> -
>            }
>            /* Geforce8 - lowend */
>            else if(strstr(gl_info->gl_renderer, "8300") ||
>                    strstr(gl_info->gl_renderer, "8400") ||

I would prefer not to extend the list with lots of additional models. In my opinion it isn't really needed as the list would become a lot longer and this makes it harder to maintain. If we would continue this way we would easily have to add two dozen additional mobile cards which are now handled as their desktop equivalents.

Roderick