Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
13e1ac0e
Commit
13e1ac0e
authored
May 20, 2020
by
Henri Verbeet
Committed by
Alexandre Julliard
May 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Set the correct patch vertex count for the Vulkan adapter.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
99f4f16b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
context_vk.c
dlls/wined3d/context_vk.c
+13
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-0
No files found.
dlls/wined3d/context_vk.c
View file @
13e1ac0e
...
...
@@ -1427,6 +1427,9 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi
if
(
a
->
ia_desc
.
primitiveRestartEnable
!=
b
->
ia_desc
.
primitiveRestartEnable
)
return
a
->
ia_desc
.
primitiveRestartEnable
-
b
->
ia_desc
.
primitiveRestartEnable
;
if
(
a
->
ts_desc
.
patchControlPoints
!=
b
->
ts_desc
.
patchControlPoints
)
return
a
->
ts_desc
.
patchControlPoints
-
b
->
ts_desc
.
patchControlPoints
;
if
((
ret
=
memcmp
(
&
a
->
viewport
,
&
b
->
viewport
,
sizeof
(
a
->
viewport
))))
return
ret
;
...
...
@@ -1496,6 +1499,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context
key
->
ia_desc
.
sType
=
VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO
;
key
->
ts_desc
.
sType
=
VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO
;
key
->
vp_desc
.
sType
=
VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO
;
key
->
vp_desc
.
viewportCount
=
1
;
key
->
vp_desc
.
pViewports
=
&
key
->
viewport
;
...
...
@@ -1526,6 +1531,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context
key
->
pipeline_desc
.
pStages
=
key
->
stages
;
key
->
pipeline_desc
.
pVertexInputState
=
&
key
->
input_desc
;
key
->
pipeline_desc
.
pInputAssemblyState
=
&
key
->
ia_desc
;
key
->
pipeline_desc
.
pTessellationState
=
&
key
->
ts_desc
;
key
->
pipeline_desc
.
pViewportState
=
&
key
->
vp_desc
;
key
->
pipeline_desc
.
pRasterizationState
=
&
key
->
rs_desc
;
key
->
pipeline_desc
.
pMultisampleState
=
&
key
->
ms_desc
;
...
...
@@ -1751,6 +1757,13 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte
update
=
true
;
}
if
(
key
->
ts_desc
.
patchControlPoints
!=
state
->
patch_vertex_count
)
{
key
->
ts_desc
.
patchControlPoints
=
state
->
patch_vertex_count
;
update
=
true
;
}
if
(
wined3d_context_is_graphics_state_dirty
(
&
context_vk
->
c
,
STATE_VIEWPORT
)
||
wined3d_context_is_graphics_state_dirty
(
&
context_vk
->
c
,
STATE_SCISSORRECT
)
||
wined3d_context_is_graphics_state_dirty
(
&
context_vk
->
c
,
STATE_RASTERIZER
))
...
...
dlls/wined3d/wined3d_private.h
View file @
13e1ac0e
...
...
@@ -2331,6 +2331,7 @@ struct wined3d_graphics_pipeline_key_vk
VkPipelineVertexInputStateCreateInfo
input_desc
;
VkPipelineInputAssemblyStateCreateInfo
ia_desc
;
VkPipelineTessellationStateCreateInfo
ts_desc
;
VkPipelineViewportStateCreateInfo
vp_desc
;
VkPipelineRasterizationStateCreateInfo
rs_desc
;
VkPipelineMultisampleStateCreateInfo
ms_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