Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e946f610
Commit
e946f610
authored
Feb 25, 2023
by
Giovanni Mascellani
Committed by
Alexandre Julliard
Mar 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dxgi: Immediately error out when creating a D3D12 swapchain on a non-immediate queue.
parent
494eec10
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
d3d12.c
dlls/d3d12/tests/d3d12.c
+0
-1
swapchain.c
dlls/dxgi/swapchain.c
+5
-0
No files found.
dlls/d3d12/tests/d3d12.c
View file @
e946f610
...
@@ -1474,7 +1474,6 @@ static void test_invalid_command_queue_types(void)
...
@@ -1474,7 +1474,6 @@ static void test_invalid_command_queue_types(void)
hr
=
IDXGIFactory_CreateSwapChain
(
factory
,
queue_unk
,
&
swapchain_desc
,
&
swapchain
);
hr
=
IDXGIFactory_CreateSwapChain
(
factory
,
queue_unk
,
&
swapchain_desc
,
&
swapchain
);
expected
=
queue_types
[
i
]
==
D3D12_COMMAND_LIST_TYPE_DIRECT
?
S_OK
:
DXGI_ERROR_INVALID_CALL
;
expected
=
queue_types
[
i
]
==
D3D12_COMMAND_LIST_TYPE_DIRECT
?
S_OK
:
DXGI_ERROR_INVALID_CALL
;
todo_wine_if
(
queue_types
[
i
]
!=
D3D12_COMMAND_LIST_TYPE_DIRECT
)
ok
(
hr
==
expected
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
ok
(
hr
==
expected
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
if
(
hr
==
S_OK
)
if
(
hr
==
S_OK
)
...
...
dlls/dxgi/swapchain.c
View file @
e946f610
...
@@ -3071,6 +3071,7 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu
...
@@ -3071,6 +3071,7 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu
IDXGISwapChain1
**
swapchain
)
IDXGISwapChain1
**
swapchain
)
{
{
DXGI_SWAP_CHAIN_FULLSCREEN_DESC
default_fullscreen_desc
;
DXGI_SWAP_CHAIN_FULLSCREEN_DESC
default_fullscreen_desc
;
struct
D3D12_COMMAND_QUEUE_DESC
queue_desc
;
struct
d3d12_swapchain
*
object
;
struct
d3d12_swapchain
*
object
;
ID3D12Device
*
device
;
ID3D12Device
*
device
;
HRESULT
hr
;
HRESULT
hr
;
...
@@ -3078,6 +3079,10 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu
...
@@ -3078,6 +3079,10 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu
if
(
swapchain_desc
->
Format
==
DXGI_FORMAT_UNKNOWN
)
if
(
swapchain_desc
->
Format
==
DXGI_FORMAT_UNKNOWN
)
return
DXGI_ERROR_INVALID_CALL
;
return
DXGI_ERROR_INVALID_CALL
;
queue_desc
=
ID3D12CommandQueue_GetDesc
(
queue
);
if
(
queue_desc
.
Type
!=
D3D12_COMMAND_LIST_TYPE_DIRECT
)
return
DXGI_ERROR_INVALID_CALL
;
if
(
!
fullscreen_desc
)
if
(
!
fullscreen_desc
)
{
{
memset
(
&
default_fullscreen_desc
,
0
,
sizeof
(
default_fullscreen_desc
));
memset
(
&
default_fullscreen_desc
,
0
,
sizeof
(
default_fullscreen_desc
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment