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
cb5163f9
Commit
cb5163f9
authored
10 months ago
by
Conor McCarthy
Committed by
Alexandre Julliard
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/dxil: Implement DX intrinsic WaveAllBitCount.
parent
4b3a948e
No related branches found
No related tags found
1 merge request
!856
vkd3d-shader/dxil: Wave ops part 3.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libs/vkd3d-shader/d3d_asm.c
+1
-0
1 addition, 0 deletions
libs/vkd3d-shader/d3d_asm.c
libs/vkd3d-shader/dxil.c
+4
-0
4 additions, 0 deletions
libs/vkd3d-shader/dxil.c
libs/vkd3d-shader/vkd3d_shader_private.h
+1
-0
1 addition, 0 deletions
libs/vkd3d-shader/vkd3d_shader_private.h
with
6 additions
and
0 deletions
libs/vkd3d-shader/d3d_asm.c
+
1
−
0
View file @
cb5163f9
...
@@ -332,6 +332,7 @@ static const char * const shader_opcode_names[] =
...
@@ -332,6 +332,7 @@ static const char * const shader_opcode_names[] =
[
VKD3DSIH_WAVE_ACTIVE_BIT_AND
]
=
"wave_active_bit_and"
,
[
VKD3DSIH_WAVE_ACTIVE_BIT_AND
]
=
"wave_active_bit_and"
,
[
VKD3DSIH_WAVE_ACTIVE_BIT_OR
]
=
"wave_active_bit_or"
,
[
VKD3DSIH_WAVE_ACTIVE_BIT_OR
]
=
"wave_active_bit_or"
,
[
VKD3DSIH_WAVE_ACTIVE_BIT_XOR
]
=
"wave_active_bit_xor"
,
[
VKD3DSIH_WAVE_ACTIVE_BIT_XOR
]
=
"wave_active_bit_xor"
,
[
VKD3DSIH_WAVE_ALL_BIT_COUNT
]
=
"wave_all_bit_count"
,
[
VKD3DSIH_WAVE_ALL_TRUE
]
=
"wave_all_true"
,
[
VKD3DSIH_WAVE_ALL_TRUE
]
=
"wave_all_true"
,
[
VKD3DSIH_WAVE_ANY_TRUE
]
=
"wave_any_true"
,
[
VKD3DSIH_WAVE_ANY_TRUE
]
=
"wave_any_true"
,
[
VKD3DSIH_WAVE_OP_ADD
]
=
"wave_op_add"
,
[
VKD3DSIH_WAVE_OP_ADD
]
=
"wave_op_add"
,
...
...
This diff is collapsed.
Click to expand it.
libs/vkd3d-shader/dxil.c
+
4
−
0
View file @
cb5163f9
...
@@ -457,6 +457,7 @@ enum dx_intrinsic_opcode
...
@@ -457,6 +457,7 @@ enum dx_intrinsic_opcode
DX_WAVE_PREFIX_OP
=
121
,
DX_WAVE_PREFIX_OP
=
121
,
DX_LEGACY_F32TOF16
=
130
,
DX_LEGACY_F32TOF16
=
130
,
DX_LEGACY_F16TOF32
=
131
,
DX_LEGACY_F16TOF32
=
131
,
DX_WAVE_ALL_BIT_COUNT
=
135
,
DX_RAW_BUFFER_LOAD
=
139
,
DX_RAW_BUFFER_LOAD
=
139
,
DX_RAW_BUFFER_STORE
=
140
,
DX_RAW_BUFFER_STORE
=
140
,
};
};
...
@@ -4555,6 +4556,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op)
...
@@ -4555,6 +4556,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op)
return
VKD3DSIH_F16TOF32
;
return
VKD3DSIH_F16TOF32
;
case
DX_WAVE_ACTIVE_ALL_EQUAL
:
case
DX_WAVE_ACTIVE_ALL_EQUAL
:
return
VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL
;
return
VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL
;
case
DX_WAVE_ALL_BIT_COUNT
:
return
VKD3DSIH_WAVE_ALL_BIT_COUNT
;
case
DX_WAVE_ALL_TRUE
:
case
DX_WAVE_ALL_TRUE
:
return
VKD3DSIH_WAVE_ALL_TRUE
;
return
VKD3DSIH_WAVE_ALL_TRUE
;
case
DX_WAVE_ANY_TRUE
:
case
DX_WAVE_ANY_TRUE
:
...
@@ -6233,6 +6236,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] =
...
@@ -6233,6 +6236,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] =
[
DX_WAVE_ACTIVE_BALLOT
]
=
{
"V"
,
"1"
,
sm6_parser_emit_dx_wave_active_ballot
},
[
DX_WAVE_ACTIVE_BALLOT
]
=
{
"V"
,
"1"
,
sm6_parser_emit_dx_wave_active_ballot
},
[
DX_WAVE_ACTIVE_BIT
]
=
{
"m"
,
"Rc"
,
sm6_parser_emit_dx_wave_active_bit
},
[
DX_WAVE_ACTIVE_BIT
]
=
{
"m"
,
"Rc"
,
sm6_parser_emit_dx_wave_active_bit
},
[
DX_WAVE_ACTIVE_OP
]
=
{
"n"
,
"Rcc"
,
sm6_parser_emit_dx_wave_op
},
[
DX_WAVE_ACTIVE_OP
]
=
{
"n"
,
"Rcc"
,
sm6_parser_emit_dx_wave_op
},
[
DX_WAVE_ALL_BIT_COUNT
]
=
{
"i"
,
"1"
,
sm6_parser_emit_dx_unary
},
[
DX_WAVE_ALL_TRUE
]
=
{
"1"
,
"1"
,
sm6_parser_emit_dx_unary
},
[
DX_WAVE_ALL_TRUE
]
=
{
"1"
,
"1"
,
sm6_parser_emit_dx_unary
},
[
DX_WAVE_ANY_TRUE
]
=
{
"1"
,
"1"
,
sm6_parser_emit_dx_unary
},
[
DX_WAVE_ANY_TRUE
]
=
{
"1"
,
"1"
,
sm6_parser_emit_dx_unary
},
[
DX_WAVE_GET_LANE_COUNT
]
=
{
"i"
,
""
,
sm6_parser_emit_dx_wave_builtin
},
[
DX_WAVE_GET_LANE_COUNT
]
=
{
"i"
,
""
,
sm6_parser_emit_dx_wave_builtin
},
...
...
This diff is collapsed.
Click to expand it.
libs/vkd3d-shader/vkd3d_shader_private.h
+
1
−
0
View file @
cb5163f9
...
@@ -533,6 +533,7 @@ enum vkd3d_shader_opcode
...
@@ -533,6 +533,7 @@ enum vkd3d_shader_opcode
VKD3DSIH_WAVE_ACTIVE_BIT_AND
,
VKD3DSIH_WAVE_ACTIVE_BIT_AND
,
VKD3DSIH_WAVE_ACTIVE_BIT_OR
,
VKD3DSIH_WAVE_ACTIVE_BIT_OR
,
VKD3DSIH_WAVE_ACTIVE_BIT_XOR
,
VKD3DSIH_WAVE_ACTIVE_BIT_XOR
,
VKD3DSIH_WAVE_ALL_BIT_COUNT
,
VKD3DSIH_WAVE_ALL_TRUE
,
VKD3DSIH_WAVE_ALL_TRUE
,
VKD3DSIH_WAVE_ANY_TRUE
,
VKD3DSIH_WAVE_ANY_TRUE
,
VKD3DSIH_WAVE_OP_ADD
,
VKD3DSIH_WAVE_OP_ADD
,
...
...
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