Henri Verbeet : dxgi: Simplify the shader model comparison in dxgi_check_feature_level_support( ).
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 24 11:04:00 CDT 2016
Module: wine
Branch: master
Commit: 73da1b951d851b1d7fd52685061166fc8362d07e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=73da1b951d851b1d7fd52685061166fc8362d07e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Mar 23 17:58:19 2016 +0100
dxgi: Simplify the shader model comparison in dxgi_check_feature_level_support().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dxgi/utils.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c
index cd8888f..c0c1fcd 100644
--- a/dlls/dxgi/utils.c
+++ b/dlls/dxgi/utils.c
@@ -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 selected_feature_level = 0;
+ unsigned int shader_model;
unsigned int i, j;
WINED3DCAPS caps;
HRESULT hr;
@@ -504,14 +505,14 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory,
if (FAILED(hr))
level_count = 0;
+ shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion);
for (i = 0; i < level_count; ++i)
{
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 (caps.VertexShaderVersion >= feature_levels_sm[j].sm
- && caps.PixelShaderVersion >= feature_levels_sm[j].sm)
+ if (shader_model >= feature_levels_sm[j].sm)
{
selected_feature_level = feature_levels[i];
TRACE("Choosing supported feature level %s (SM%u).\n",
More information about the wine-cvs
mailing list