Module: wine Branch: master Commit: bed0266a8c93f67fa5d22731ec12614ab46528ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed0266a8c93f67fa5d22731ec...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Nov 9 11:38:42 2010 +0100
wined3d: Recognize Evergreen in select_card_ati_mesa().
---
dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a06130b..ac23b3d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -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 */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8550d1..8f6c96e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -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,