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

dxgi: Simplify the shader model comparison in dxgi_check_feature_level_support(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-03-23 17:58:19 +01:00 committed by Alexandre Julliard
parent 510c8e3983
commit 73da1b951d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/dxgi/utils.c
View File

@ -491,6 +491,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory,
{D3D_FEATURE_LEVEL_9_1, 2}, {D3D_FEATURE_LEVEL_9_1, 2},
}; };
D3D_FEATURE_LEVEL selected_feature_level = 0; D3D_FEATURE_LEVEL selected_feature_level = 0;
unsigned int shader_model;
unsigned int i, j; unsigned int i, j;
WINED3DCAPS caps; WINED3DCAPS caps;
HRESULT hr; HRESULT hr;
@ -504,14 +505,14 @@ 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 < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j) for (j = 0; j < sizeof(feature_levels_sm) / sizeof(feature_levels_sm[0]); ++j)
{ {
if (feature_levels[i] == feature_levels_sm[j].feature_level) if (feature_levels[i] == feature_levels_sm[j].feature_level)
{ {
if (caps.VertexShaderVersion >= feature_levels_sm[j].sm if (shader_model >= feature_levels_sm[j].sm)
&& caps.PixelShaderVersion >= feature_levels_sm[j].sm)
{ {
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 (SM%u).\n",