[Patch] for wined3d: Correcting order issue

Marco Schuster marco at harddisk.is-a-geek.org
Thu Nov 29 14:34:52 CST 2007


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") ||

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20071129/ddcb4d9c/attachment.pgp 


More information about the wine-patches mailing list