ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Remove hardware level detection hacks. 

Core contexts are enabled by default since
0db4d1c251.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-06-11 12:05:07 +02:00 committed by Alexandre Julliard
parent 49da19e51b
commit 4ef04c7ebc
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/directx.c
View File

@ -1857,22 +1857,15 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s
return HW_VENDOR_NVIDIA;
}
static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps, DWORD glsl_version)
static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shader_caps,
const struct fragment_caps *fragment_caps)
{
if (shader_caps->vs_version >= 5)
return WINED3D_D3D_LEVEL_11;
if (shader_caps->vs_version == 4)
return WINED3D_D3D_LEVEL_10;
if (shader_caps->vs_version == 3)
{
/* wined3d with default settings at the moment doesn't expose SM4+ on
* Mesa drivers. */
if (glsl_version >= MAKEDWORD_VERSION(4, 30))
return WINED3D_D3D_LEVEL_11;
if (glsl_version >= MAKEDWORD_VERSION(1, 30))
return WINED3D_D3D_LEVEL_10;
return WINED3D_D3D_LEVEL_9_SM3;
}
if (shader_caps->vs_version == 2)
return WINED3D_D3D_LEVEL_9_SM2;
if (shader_caps->vs_version == 1)
@ -2562,9 +2555,9 @@ static enum wined3d_pci_device wined3d_guess_card(const struct shader_caps *shad
* memory behind our backs if really needed. Note that the amount of video
* memory can be overruled using a registry setting. */
unsigned int i;
enum wined3d_d3d_level d3d_level = d3d_level_from_caps(shader_caps, fragment_caps, glsl_version);
enum wined3d_d3d_level d3d_level = d3d_level_from_caps(shader_caps, fragment_caps);
enum wined3d_pci_device device;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(card_vendor_table); ++i)
{