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
83851133
Commit
83851133
authored
1 year ago
by
Conor McCarthy
Committed by
Alexandre Julliard
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/ir: Set merged signature element interpolation mode only from used elements.
parent
759362b5
No related branches found
No related tags found
1 merge request
!536
vkd3d-shader/ir: Set merged signature element interpolation mode only from used elements.
Pipeline
#21047
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libs/vkd3d-shader/ir.c
+13
-0
13 additions, 0 deletions
libs/vkd3d-shader/ir.c
tests/d3d12.c
+0
-1
0 additions, 1 deletion
tests/d3d12.c
with
13 additions
and
1 deletion
libs/vkd3d-shader/ir.c
+
13
−
0
View file @
83851133
...
...
@@ -840,6 +840,7 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map
unsigned
int
i
,
j
,
element_count
,
new_count
,
register_count
;
struct
signature_element
*
elements
;
struct
signature_element
*
e
,
*
f
;
bool
used
;
element_count
=
s
->
element_count
;
if
(
!
(
elements
=
vkd3d_malloc
(
element_count
*
sizeof
(
*
elements
))))
...
...
@@ -860,6 +861,8 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map
if
(
range_map_get_register_count
(
range_map
,
e
->
register_index
,
e
->
mask
)
>
1
)
continue
;
used
=
e
->
used_mask
;
for
(;
j
<
element_count
;
++
j
)
{
f
=
&
elements
[
j
];
...
...
@@ -877,6 +880,16 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map
e
->
mask
|=
f
->
mask
;
e
->
used_mask
|=
f
->
used_mask
;
e
->
semantic_index
=
min
(
e
->
semantic_index
,
f
->
semantic_index
);
/* The first element may have no interpolation mode if it is unused. Elements which
* actually have different interpolation modes are assigned different registers. */
if
(
f
->
used_mask
&&
!
used
)
{
if
(
e
->
interpolation_mode
&&
e
->
interpolation_mode
!=
f
->
interpolation_mode
)
FIXME
(
"Mismatching interpolation modes %u and %u.
\n
"
,
e
->
interpolation_mode
,
f
->
interpolation_mode
);
else
e
->
interpolation_mode
=
f
->
interpolation_mode
;
}
}
}
element_count
=
new_count
;
...
...
This diff is collapsed.
Click to expand it.
tests/d3d12.c
+
0
−
1
View file @
83851133
...
...
@@ -37943,7 +37943,6 @@ static void test_unused_interpolated_input(void)
D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
get_resource_readback_with_command_list(context.render_target, 0, &rb, queue, command_list);
todo
check_readback_data_uint(&rb.rb, &box, 0xff00ff00, 0);
release_resource_readback(&rb);
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