wine/ dlls/wined3d/directx.c include/wine/wine ...

[Alexandre Julliard]

ChangeSet ID:	21578
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard(a)winehq.org	2005/11/30 14:56:17

Modified files:
	dlls/wined3d   : directx.c 
	include/wine   : wined3d_gl.h 

Log message:
	Willie Sippel <willie(a)zeitgeistmedia.net>
	Added more Nvidia card IDs.

Patch: http://cvs.winehq.org/patch.py?id=21578

Old revision  New revision  Changes     Path
 1.63          1.64          +8 -0       wine/dlls/wined3d/directx.c
 1.13          1.14          +4 -0       wine/include/wine/wined3d_gl.h

Index: wine/dlls/wined3d/directx.c
diff -u -p wine/dlls/wined3d/directx.c:1.63 wine/dlls/wined3d/directx.c:1.64
--- wine/dlls/wined3d/directx.c:1.63	30 Nov 2005 20:56:17 -0000
+++ wine/dlls/wined3d/directx.c	30 Nov 2005 20:56:17 -0000
@@ -368,6 +368,14 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine
                 gl_info->gl_card = CARD_NVIDIA_GEFORCE4_TI4600;
             } else if (strstr(gl_info->gl_renderer, "GeForceFX")) {
                 gl_info->gl_card = CARD_NVIDIA_GEFORCEFX_5900ULTRA;
+            } else if (strstr(gl_info->gl_renderer, "Quadro FX 3000")) {
+                gl_info->gl_card = CARD_NVIDIA_QUADROFX_3000;
+            } else if (strstr(gl_info->gl_renderer, "GeForce 6800")) {
+                gl_info->gl_card = CARD_NVIDIA_GEFORCE_6800ULTRA;
+            } else if (strstr(gl_info->gl_renderer, "Quadro FX 4000")) {
+                gl_info->gl_card = CARD_NVIDIA_QUADROFX_4000;
+            } else if (strstr(gl_info->gl_renderer, "GeForce 7800")) {
+                gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800ULTRA;
             } else {
                 gl_info->gl_card = CARD_NVIDIA_GEFORCE4_TI4600;
             }
Index: wine/include/wine/wined3d_gl.h
diff -u -p wine/include/wine/wined3d_gl.h:1.13 wine/include/wine/wined3d_gl.h:1.14
--- wine/include/wine/wined3d_gl.h:1.13	30 Nov 2005 20:56:17 -0000
+++ wine/include/wine/wined3d_gl.h	30 Nov 2005 20:56:17 -0000
@@ -860,6 +860,10 @@ typedef enum _GL_Cards {
   CARD_NVIDIA_GEFORCE4_TI4600     = 0x0250,
   CARD_NVIDIA_GEFORCE4_TI4200     = 0x0281,
   CARD_NVIDIA_GEFORCEFX_5900ULTRA = 0x0330,
+  CARD_NVIDIA_QUADROFX_3000       = 0x0338,
+  CARD_NVIDIA_GEFORCE_6800ULTRA   = 0x0040,
+  CARD_NVIDIA_QUADROFX_4000       = 0x004e,
+  CARD_NVIDIA_GEFORCE_7800ULTRA   = 0x0090,
 
   CARD_INTEL_845G                 = 0x2562,
   CARD_INTEL_I830G                = 0x3577,