reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for Intel drivers version string.

Browse Source 
Update default driver version (nvidia).
This commit is contained in:
Raphael Junqueira 2005-11-30 12:02:45 +01:00 committed by Alexandre Julliard
parent 2ff51299c8
commit 0e68b671f4
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/wined3d/directx.c
View File

@ -225,9 +225,11 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
gotContext = TRUE; gotContext = TRUE;
} }
TRACE_(d3d_caps)("(%p, %p)\n", gl_info, display); TRACE_(d3d_caps)("(%p, %p)\n", gl_info, display);
gl_string = (const char *) glGetString(GL_RENDERER);
strcpy(gl_info->gl_renderer, gl_string);
/* Fill in the GL info retrievable depending on the display */ /* Fill in the GL info retrievable depending on the display */
if (NULL != display) { if (NULL != display) {
test = glXQueryVersion(display, &major, &minor); test = glXQueryVersion(display, &major, &minor);
@ -244,6 +246,9 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
gl_info->gl_vendor = VENDOR_NVIDIA; gl_info->gl_vendor = VENDOR_NVIDIA;
} else if (strstr(gl_string, "ATI")) { } else if (strstr(gl_string, "ATI")) {
gl_info->gl_vendor = VENDOR_ATI; gl_info->gl_vendor = VENDOR_ATI;
} else if (strstr(gl_string, "Intel(R)") ||
strstr(gl_info->gl_renderer, "Intel(R)")) {
gl_info->gl_vendor = VENDOR_INTEL;
} else if (strstr(gl_string, "Mesa")) { } else if (strstr(gl_string, "Mesa")) {
gl_info->gl_vendor = VENDOR_MESA; gl_info->gl_vendor = VENDOR_MESA;
} else { } else {
@ -319,6 +324,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
} }
break; break;
case VENDOR_INTEL:
case VENDOR_MESA: case VENDOR_MESA:
gl_string_cursor = strstr(gl_string, "Mesa"); gl_string_cursor = strstr(gl_string, "Mesa");
gl_string_cursor = strstr(gl_string_cursor, " "); gl_string_cursor = strstr(gl_string_cursor, " ");
@ -355,8 +361,6 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
TRACE_(d3d_caps)("found GL_VERSION (%s)->(0x%08lx)\n", debugstr_a(gl_string), gl_info->gl_driver_version); TRACE_(d3d_caps)("found GL_VERSION (%s)->(0x%08lx)\n", debugstr_a(gl_string), gl_info->gl_driver_version);
/* Fill in the renderer information */ /* Fill in the renderer information */
gl_string = (const char *) glGetString(GL_RENDERER);
strcpy(gl_info->gl_renderer, gl_string);
switch (gl_info->gl_vendor) { switch (gl_info->gl_vendor) {
case VENDOR_NVIDIA: case VENDOR_NVIDIA:
@ -379,6 +383,22 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
} }
break; break;
case VENDOR_INTEL:
if (strstr(gl_info->gl_renderer, "915GM")) {
gl_info->gl_card = CARD_INTEL_I915GM;
} else if (strstr(gl_info->gl_renderer, "915G")) {
gl_info->gl_card = CARD_INTEL_I915G;
} else if (strstr(gl_info->gl_renderer, "865G")) {
gl_info->gl_card = CARD_INTEL_I865G;
} else if (strstr(gl_info->gl_renderer, "855G")) {
gl_info->gl_card = CARD_INTEL_I855G;
} else if (strstr(gl_info->gl_renderer, "830G")) {
gl_info->gl_card = CARD_INTEL_I830G;
} else {
gl_info->gl_card = CARD_INTEL_I915G;
}
break;
default: default:
gl_info->gl_card = CARD_WINE; gl_info->gl_card = CARD_WINE;
break; break;
@ -995,7 +1015,7 @@ HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Adapter,
strcpy(pIdentifier->Description, "Direct3D HAL"); strcpy(pIdentifier->Description, "Direct3D HAL");
if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */ if (NULL != pIdentifier->DeviceName) strcpy(pIdentifier->DeviceName, "\\\\.\\DISPLAY"); /* FIXME: May depend on desktop? */
pIdentifier->DriverVersion->u.HighPart = 0xa; pIdentifier->DriverVersion->u.HighPart = 0xa;
pIdentifier->DriverVersion->u.LowPart = MAKEDWORD_VERSION(53, 96); /* last Linux Nvidia drivers */ pIdentifier->DriverVersion->u.LowPart = MAKEDWORD_VERSION(76, 76); /* last Linux Nvidia drivers */
*(pIdentifier->VendorId) = VENDOR_NVIDIA; *(pIdentifier->VendorId) = VENDOR_NVIDIA;
*(pIdentifier->DeviceId) = CARD_NVIDIA_GEFORCE4_TI4600; *(pIdentifier->DeviceId) = CARD_NVIDIA_GEFORCE4_TI4600;
*(pIdentifier->SubSysId) = 0; *(pIdentifier->SubSysId) = 0;

25
include/wine/wined3d_gl.h
View File

@ -846,16 +846,27 @@ typedef enum _GL_Vendors {
VENDOR_WINE = 0x0, VENDOR_WINE = 0x0,
VENDOR_MESA = 0x1, VENDOR_MESA = 0x1,
VENDOR_ATI = 0x1002, VENDOR_ATI = 0x1002,
VENDOR_NVIDIA = 0x10de VENDOR_NVIDIA = 0x10de,
VENDOR_INTEL = 0x8086
} GL_Vendors; } GL_Vendors;
typedef enum _GL_Cards { typedef enum _GL_Cards {
CARD_WINE = 0x0, CARD_WINE = 0x0,
CARD_ATI_RADEON_8500 = 0x514c,
CARD_ATI_RADEON_9700PRO = 0x4e44, CARD_ATI_RADEON_8500 = 0x514c,
CARD_ATI_RADEON_9800PRO = 0x4e48, CARD_ATI_RADEON_9700PRO = 0x4e44,
CARD_NVIDIA_GEFORCE4_TI4600 = 0x0250, CARD_ATI_RADEON_9800PRO = 0x4e48,
CARD_NVIDIA_GEFORCEFX_5900ULTRA = 0x0330
CARD_NVIDIA_GEFORCE4_TI4600 = 0x0250,
CARD_NVIDIA_GEFORCE4_TI4200 = 0x0281,
CARD_NVIDIA_GEFORCEFX_5900ULTRA = 0x0330,
CARD_INTEL_845G = 0x2562,
CARD_INTEL_I830G = 0x3577,
CARD_INTEL_I855G = 0x3582,
CARD_INTEL_I865G = 0x2572,
CARD_INTEL_I915G = 0x2582,
CARD_INTEL_I915GM = 0x2592
} GL_Cards; } GL_Cards;
typedef enum _GL_VSVersion { typedef enum _GL_VSVersion {