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

dxgi: Get supported feature levels from wined3d caps. 

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-13 12:24:03 +02:00 committed by Alexandre Julliard
parent 98ef3c8860
commit 25d4a110cb
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/dxgi/utils.c
View File

@ -626,21 +626,20 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory,
{ {
static const struct static const struct
{ {
D3D_FEATURE_LEVEL feature_level; D3D_FEATURE_LEVEL d3d;
unsigned int sm; enum wined3d_feature_level wined3d;
} }
feature_levels_sm[] = wined3d_feature_levels[] =
{ {
{D3D_FEATURE_LEVEL_11_1, 5}, {D3D_FEATURE_LEVEL_11_1, WINED3D_FEATURE_LEVEL_11},
{D3D_FEATURE_LEVEL_11_0, 5}, {D3D_FEATURE_LEVEL_11_0, WINED3D_FEATURE_LEVEL_11},
{D3D_FEATURE_LEVEL_10_1, 4}, {D3D_FEATURE_LEVEL_10_1, WINED3D_FEATURE_LEVEL_10},
{D3D_FEATURE_LEVEL_10_0, 4}, {D3D_FEATURE_LEVEL_10_0, WINED3D_FEATURE_LEVEL_10},
{D3D_FEATURE_LEVEL_9_3, 3}, {D3D_FEATURE_LEVEL_9_3, WINED3D_FEATURE_LEVEL_9_SM3},
{D3D_FEATURE_LEVEL_9_2, 2}, {D3D_FEATURE_LEVEL_9_2, WINED3D_FEATURE_LEVEL_9_SM2},
{D3D_FEATURE_LEVEL_9_1, 2}, {D3D_FEATURE_LEVEL_9_1, WINED3D_FEATURE_LEVEL_9_SM2},
}; };
D3D_FEATURE_LEVEL selected_feature_level = 0; D3D_FEATURE_LEVEL selected_feature_level = 0;
unsigned int shader_model;
struct wined3d_caps caps; struct wined3d_caps caps;
unsigned int i, j; unsigned int i, j;
HRESULT hr; HRESULT hr;
@ -652,18 +651,17 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory,
if (FAILED(hr)) if (FAILED(hr))
level_count = 0; level_count = 0;
shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion);
for (i = 0; i < level_count; ++i) for (i = 0; i < level_count; ++i)
{ {
for (j = 0; j < ARRAY_SIZE(feature_levels_sm); ++j) for (j = 0; j < ARRAY_SIZE(wined3d_feature_levels); ++j)
{ {
if (feature_levels[i] == feature_levels_sm[j].feature_level) if (feature_levels[i] == wined3d_feature_levels[j].d3d)
{ {
if (shader_model >= feature_levels_sm[j].sm) if (caps.max_feature_level >= wined3d_feature_levels[j].wined3d)
{ {
selected_feature_level = feature_levels[i]; selected_feature_level = feature_levels[i];
TRACE("Choosing supported feature level %s (SM%u).\n", TRACE("Choosing supported feature level %s.\n",
debug_feature_level(selected_feature_level), feature_levels_sm[j].sm); debug_feature_level(selected_feature_level));
} }
break; break;
} }
@ -671,7 +669,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory,
if (selected_feature_level) if (selected_feature_level)
break; break;
if (j == ARRAY_SIZE(feature_levels_sm)) if (j == ARRAY_SIZE(wined3d_feature_levels))
FIXME("Unexpected feature level %#x.\n", feature_levels[i]); FIXME("Unexpected feature level %#x.\n", feature_levels[i]);
else else
TRACE("Feature level %s not supported, trying next fallback if available.\n", TRACE("Feature level %s not supported, trying next fallback if available.\n",