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

wined3d: Add remaining feature levels. 

We still don't have proper and exhaustive checks for feature levels
capabilities.

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-09-24 01:09:30 +02:00 committed by Alexandre Julliard
parent 0fbac19e60
commit 13ec617654
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/dxgi/utils.c
View File

@ -626,11 +626,11 @@ static enum wined3d_feature_level wined3d_feature_level_from_d3d(D3D_FEATURE_LEV
switch (feature_level) switch (feature_level)
{ {
case D3D_FEATURE_LEVEL_11_1: case D3D_FEATURE_LEVEL_11_1:
return WINED3D_FEATURE_LEVEL_11; return WINED3D_FEATURE_LEVEL_11_1;
case D3D_FEATURE_LEVEL_11_0: case D3D_FEATURE_LEVEL_11_0:
return WINED3D_FEATURE_LEVEL_11; return WINED3D_FEATURE_LEVEL_11;
case D3D_FEATURE_LEVEL_10_1: case D3D_FEATURE_LEVEL_10_1:
return WINED3D_FEATURE_LEVEL_10; return WINED3D_FEATURE_LEVEL_10_1;
case D3D_FEATURE_LEVEL_10_0: case D3D_FEATURE_LEVEL_10_0:
return WINED3D_FEATURE_LEVEL_10; return WINED3D_FEATURE_LEVEL_10;
case D3D_FEATURE_LEVEL_9_3: case D3D_FEATURE_LEVEL_9_3:
@ -638,7 +638,7 @@ static enum wined3d_feature_level wined3d_feature_level_from_d3d(D3D_FEATURE_LEV
case D3D_FEATURE_LEVEL_9_2: case D3D_FEATURE_LEVEL_9_2:
return WINED3D_FEATURE_LEVEL_9_SM2; return WINED3D_FEATURE_LEVEL_9_SM2;
case D3D_FEATURE_LEVEL_9_1: case D3D_FEATURE_LEVEL_9_1:
return WINED3D_FEATURE_LEVEL_9_SM2; return WINED3D_FEATURE_LEVEL_9_1;
default: default:
FIXME("Unhandled feature level %#x.\n", feature_level); FIXME("Unhandled feature level %#x.\n", feature_level);
return 0; return 0;

6
dlls/wined3d/adapter_gl.c
View File

@ -1256,10 +1256,14 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g
if (shader_model >= 5 if (shader_model >= 5
&& gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_DRAW_INDIRECT]
&& gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC])
return WINED3D_FEATURE_LEVEL_11; return WINED3D_FEATURE_LEVEL_11_1;
if (shader_model >= 4) if (shader_model >= 4)
{
if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY])
return WINED3D_FEATURE_LEVEL_10_1;
return WINED3D_FEATURE_LEVEL_10; return WINED3D_FEATURE_LEVEL_10;
}
} }
if (shader_model >= 3) if (shader_model >= 3)

3
include/wine/wined3d.h
View File

@ -95,10 +95,13 @@ enum wined3d_feature_level
WINED3D_FEATURE_LEVEL_6 = 0x6000, WINED3D_FEATURE_LEVEL_6 = 0x6000,
WINED3D_FEATURE_LEVEL_7 = 0x7000, WINED3D_FEATURE_LEVEL_7 = 0x7000,
WINED3D_FEATURE_LEVEL_8 = 0x8000, WINED3D_FEATURE_LEVEL_8 = 0x8000,
WINED3D_FEATURE_LEVEL_9_1 = 0x9100,
WINED3D_FEATURE_LEVEL_9_SM2 = 0x9200, WINED3D_FEATURE_LEVEL_9_SM2 = 0x9200,
WINED3D_FEATURE_LEVEL_9_SM3 = 0x9300, WINED3D_FEATURE_LEVEL_9_SM3 = 0x9300,
WINED3D_FEATURE_LEVEL_10 = 0xa000, WINED3D_FEATURE_LEVEL_10 = 0xa000,
WINED3D_FEATURE_LEVEL_10_1 = 0xa100,
WINED3D_FEATURE_LEVEL_11 = 0xb000, WINED3D_FEATURE_LEVEL_11 = 0xb000,
WINED3D_FEATURE_LEVEL_11_1 = 0xb100,
}; };
enum wined3d_degree_type enum wined3d_degree_type