mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-09-13 09:16:14 -07:00
vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL.
This commit is contained in:
parent
677c23f1fe
commit
d17956ced8
Notes:
Alexandre Julliard
2024-05-13 22:57:09 +02:00
Approved-by: Giovanni Mascellani (@giomasce) Approved-by: Henri Verbeet (@hverbeet) Approved-by: Alexandre Julliard (@julliard) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/860
@ -3490,9 +3490,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9
|
||||
TRACE("Request shader model %#x.\n", data->HighestShaderModel);
|
||||
|
||||
#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL
|
||||
data->HighestShaderModel = D3D_SHADER_MODEL_6_0;
|
||||
data->HighestShaderModel = min(data->HighestShaderModel, D3D_SHADER_MODEL_6_0);
|
||||
#else
|
||||
data->HighestShaderModel = D3D_SHADER_MODEL_5_1;
|
||||
data->HighestShaderModel = min(data->HighestShaderModel, D3D_SHADER_MODEL_5_1);
|
||||
#endif
|
||||
|
||||
TRACE("Shader model %#x.\n", data->HighestShaderModel);
|
||||
|
@ -994,7 +994,6 @@ static void test_check_feature_support(void)
|
||||
shader_model.HighestShaderModel = D3D_SHADER_MODEL_5_1;
|
||||
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model));
|
||||
ok(hr == S_OK, "Failed to check shader model, hr %#x.\n", hr);
|
||||
todo
|
||||
ok(shader_model.HighestShaderModel <= D3D_SHADER_MODEL_5_1,
|
||||
"Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, D3D_SHADER_MODEL_5_1);
|
||||
for (sm = D3D_HIGHEST_SHADER_MODEL; sm >= D3D_SHADER_MODEL_6_0; --sm)
|
||||
|
Loading…
Reference in New Issue
Block a user