reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 22:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Recognize Evergreen in select_card_ati_mesa().

Browse Source
This commit is contained in:
Henri Verbeet 2010-11-09 11:38:42 +01:00 committed by Alexandre Julliard
parent 6ae987ea98
commit bed0266a8c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/wined3d/directx.c
View File

@ -1102,8 +1102,11 @@ static const struct gpu_description gpu_description_table[] =
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_ATI_R600, 512 },
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_ATI_R600, 512 },
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD4800, "ATI Radeon HD 4800 Series", DRIVER_ATI_R600, 512 },
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD5400, "ATI Radeon HD 5400 Series", DRIVER_ATI_R600, 512 },
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD5600, "ATI Radeon HD 5600 Series", DRIVER_ATI_R600, 512 },
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, 512 },
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, 1024},
{HW_VENDOR_ATI, CARD_ATI_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_ATI_R600, 1024},
/* Intel cards */
{HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 },
{HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 },
@ -1860,6 +1863,17 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info
* eg HD 4800 is returned for multiple cards, even for RV790 based ones. */
if (strstr(gl_renderer, "Gallium"))
{
if (strstr(gl_renderer, "HEMLOCK"))
return CARD_ATI_RADEON_HD5900;
if (strstr(gl_renderer, "CYPRESS"))
return CARD_ATI_RADEON_HD5800;
if (strstr(gl_renderer, "JUNIPER"))
return CARD_ATI_RADEON_HD5700;
if (strstr(gl_renderer, "REDWOOD"))
return CARD_ATI_RADEON_HD5600;
if (strstr(gl_renderer, "CEDAR"))
return CARD_ATI_RADEON_HD5400;
/* Radeon R7xx HD4800 - highend */
if (strstr(gl_renderer, "R700") /* Radeon R7xx HD48xx generic renderer string */
|| strstr(gl_renderer, "RV770") /* Radeon RV770 */

3
dlls/wined3d/wined3d_private.h
View File

@ -1346,12 +1346,15 @@ enum wined3d_pci_device
CARD_ATI_RADEON_HD4850 = 0x9442,
CARD_ATI_RADEON_HD4870 = 0x9440,
CARD_ATI_RADEON_HD4890 = 0x9460,
CARD_ATI_RADEON_HD5400 = 0x68f9,
CARD_ATI_RADEON_HD5600 = 0x68d8,
CARD_ATI_RADEON_HD5700 = 0x68BE, /* Picked HD5750 */
CARD_ATI_RADEON_HD5750 = 0x68BE,
CARD_ATI_RADEON_HD5770 = 0x68B8,
CARD_ATI_RADEON_HD5800 = 0x6898, /* Picked HD5850 */
CARD_ATI_RADEON_HD5850 = 0x6898,
CARD_ATI_RADEON_HD5870 = 0x6899,
CARD_ATI_RADEON_HD5900 = 0x689c,
CARD_NVIDIA_RIVA_128 = 0x0018,
CARD_NVIDIA_RIVA_TNT = 0x0020,