Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
fb20639e
Commit
fb20639e
authored
10 months ago
by
Conor McCarthy
Committed by
Alexandre Julliard
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d: Return E_INVALIDARG if the requested shader model is unknown.
parent
d17956ce
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!860
vkd3d: Fix D3D12_FEATURE_SHADER_MODEL results.
Pipeline
#26334
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libs/vkd3d/device.c
+8
-0
8 additions, 0 deletions
libs/vkd3d/device.c
tests/d3d12.c
+0
-3
0 additions, 3 deletions
tests/d3d12.c
with
8 additions
and
3 deletions
libs/vkd3d/device.c
+
8
−
0
View file @
fb20639e
...
...
@@ -3487,6 +3487,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9
return
E_INVALIDARG
;
}
if
(
data
->
HighestShaderModel
!=
D3D_SHADER_MODEL_5_1
&&
(
data
->
HighestShaderModel
<
D3D_SHADER_MODEL_6_0
||
data
->
HighestShaderModel
>
D3D_HIGHEST_SHADER_MODEL
))
{
WARN
(
"Unknown shader model %#x.
\n
"
,
data
->
HighestShaderModel
);
return
E_INVALIDARG
;
}
TRACE
(
"Request shader model %#x.
\n
"
,
data
->
HighestShaderModel
);
#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL
...
...
This diff is collapsed.
Click to expand it.
tests/d3d12.c
+
0
−
3
View file @
fb20639e
...
...
@@ -1010,15 +1010,12 @@ static void test_check_feature_support(void)
"Got shader model %#x, expected <= %#x.\n", shader_model.HighestShaderModel, sm);
shader_model.HighestShaderModel = 0x89;
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model));
todo
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
shader_model.HighestShaderModel = 0x52;
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model));
todo
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
shader_model.HighestShaderModel = 0;
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &shader_model, sizeof(shader_model));
todo
ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
/* Root signature */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment