Skip to content

W
wine-winehq
Commit 22475ddd authored by Andrei Slăvoiu's avatar Andrei Slăvoiu Committed by Alexandre Julliard
Browse files
Options

wined3d: Remove usage of gl_info parameter from select_card_amd_binary.

parent 665c2e1e
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 14 deletions
dlls/wined3d/directx.c
View file @ 22475ddd
...@@ -1856,14 +1856,10 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl ...@@ -1856,14 +1856,10 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl
static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_info *gl_info, static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_info *gl_info,
const char *gl_renderer) const char *gl_renderer)
{ {
UINT d3d_level = d3d_level_from_gl_info(gl_info);
/* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx
* *
* Beware: renderer string do not match exact card model, * Beware: renderer string do not match exact card model,
* eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */
if (d3d_level >= 10)
{
unsigned int i; unsigned int i;
static const struct static const struct
...@@ -1881,15 +1877,15 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in ...@@ -1881,15 +1877,15 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in
{"HD 6970", CARD_AMD_RADEON_HD6900}, {"HD 6970", CARD_AMD_RADEON_HD6900},
{"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6900", CARD_AMD_RADEON_HD6900},
{"HD 6800", CARD_AMD_RADEON_HD6800}, {"HD 6800", CARD_AMD_RADEON_HD6800},
{"HD 6770M",CARD_AMD_RADEON_HD6600M}, {"HD 6770M", CARD_AMD_RADEON_HD6600M},
{"HD 6750M",CARD_AMD_RADEON_HD6600M}, {"HD 6750M", CARD_AMD_RADEON_HD6600M},
{"HD 6700", CARD_AMD_RADEON_HD6700}, {"HD 6700", CARD_AMD_RADEON_HD6700},
{"HD 6670", CARD_AMD_RADEON_HD6600}, {"HD 6670", CARD_AMD_RADEON_HD6600},
{"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6630M", CARD_AMD_RADEON_HD6600M},
{"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M", CARD_AMD_RADEON_HD6600M},
{"HD 6600", CARD_AMD_RADEON_HD6600}, {"HD 6600", CARD_AMD_RADEON_HD6600},
{"HD 6570", CARD_AMD_RADEON_HD6600}, {"HD 6570", CARD_AMD_RADEON_HD6600},
{"HD 6500M",CARD_AMD_RADEON_HD6600M}, {"HD 6500M", CARD_AMD_RADEON_HD6600M},
{"HD 6500", CARD_AMD_RADEON_HD6600}, {"HD 6500", CARD_AMD_RADEON_HD6600},
{"HD 6400", CARD_AMD_RADEON_HD6400}, {"HD 6400", CARD_AMD_RADEON_HD6400},
{"HD 6300", CARD_AMD_RADEON_HD6300}, {"HD 6300", CARD_AMD_RADEON_HD6300},
...@@ -1945,11 +1941,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in ...@@ -1945,11 +1941,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in
if (strstr(gl_renderer, cards[i].renderer)) if (strstr(gl_renderer, cards[i].renderer))
return cards[i].id; return cards[i].id;
} }
return PCI_DEVICE_NONE;
}
if (d3d_level >= 9)
{
/* Radeon R5xx */ /* Radeon R5xx */
if (strstr(gl_renderer, "X1600") if (strstr(gl_renderer, "X1600")
|| strstr(gl_renderer, "X1650") || strstr(gl_renderer, "X1650")
...@@ -1982,7 +1974,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in ...@@ -1982,7 +1974,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in
{ {
return CARD_AMD_RADEON_XPRESS_200M; return CARD_AMD_RADEON_XPRESS_200M;
} }
}
return PCI_DEVICE_NONE; return PCI_DEVICE_NONE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment