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
d164752e
Commit
d164752e
authored
9 months ago
by
Elizabeth Figura
Committed by
Henri Verbeet
4 months ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/d3dbc: Introduce d3dbc_parse_register().
parent
3c532930
No related branches found
No related tags found
1 merge request
!1322
vkd3d-shader: Separate sm1 register types in vsir.
Pipeline
#36042
skipped
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/vkd3d-shader/d3dbc.c
+20
-32
20 additions, 32 deletions
libs/vkd3d-shader/d3dbc.c
with
20 additions
and
32 deletions
libs/vkd3d-shader/d3dbc.c
+
20
−
32
View file @
d164752e
...
...
@@ -555,28 +555,34 @@ static enum vkd3d_shader_register_type parse_register_type(
return
VKD3DSPR_INVALID
;
}
static
void
shader_sm1_parse_src_param
(
struct
vkd3d_shader_sm1_parser
*
sm1
,
uint32_t
param
,
struct
vkd3d_shader_
src_param
*
rel_addr
,
struct
vkd3d_shader_src_param
*
src
)
static
void
d3dbc_parse_register
(
struct
vkd3d_shader_sm1_parser
*
d3dbc
,
struct
vkd3d_shader_
register
*
reg
,
uint32_t
param
,
struct
vkd3d_shader_src_param
*
rel_addr
)
{
enum
vkd3d_shader_register_type
reg_type
;
unsigned
int
index_offset
,
idx_count
;
reg_type
=
parse_register_type
(
sm1
,
param
,
&
index_offset
);
reg_type
=
parse_register_type
(
d3dbc
,
param
,
&
index_offset
);
idx_count
=
idx_count_from_reg_type
(
reg_type
);
vsir_register_init
(
&
src
->
reg
,
reg_type
,
VKD3D_DATA_FLOAT
,
idx_count
);
src
->
reg
.
precision
=
VKD3D_SHADER_REGISTER_PRECISION_DEFAULT
;
src
->
reg
.
non_uniform
=
false
;
vsir_register_init
(
reg
,
reg_type
,
VKD3D_DATA_FLOAT
,
idx_count
);
reg
->
precision
=
VKD3D_SHADER_REGISTER_PRECISION_DEFAULT
;
reg
->
non_uniform
=
false
;
if
(
idx_count
==
1
)
{
src
->
reg
.
idx
[
0
].
offset
=
index_offset
+
(
param
&
VKD3D_SM1_REGISTER_NUMBER_MASK
);
src
->
reg
.
idx
[
0
].
rel_addr
=
rel_addr
;
reg
->
idx
[
0
].
offset
=
index_offset
+
(
param
&
VKD3D_SM1_REGISTER_NUMBER_MASK
);
reg
->
idx
[
0
].
rel_addr
=
rel_addr
;
}
if
(
src
->
reg
.
type
==
VKD3DSPR_SAMPLER
)
src
->
reg
.
dimension
=
VSIR_DIMENSION_NONE
;
else
if
(
src
->
reg
.
type
==
VKD3DSPR_DEPTHOUT
)
src
->
reg
.
dimension
=
VSIR_DIMENSION_SCALAR
;
if
(
reg
->
type
==
VKD3DSPR_SAMPLER
)
reg
->
dimension
=
VSIR_DIMENSION_NONE
;
else
if
(
reg
->
type
==
VKD3DSPR_DEPTHOUT
)
reg
->
dimension
=
VSIR_DIMENSION_SCALAR
;
else
src
->
reg
.
dimension
=
VSIR_DIMENSION_VEC4
;
reg
->
dimension
=
VSIR_DIMENSION_VEC4
;
}
static
void
shader_sm1_parse_src_param
(
struct
vkd3d_shader_sm1_parser
*
sm1
,
uint32_t
param
,
struct
vkd3d_shader_src_param
*
rel_addr
,
struct
vkd3d_shader_src_param
*
src
)
{
d3dbc_parse_register
(
sm1
,
&
src
->
reg
,
param
,
rel_addr
);
src
->
swizzle
=
swizzle_from_sm1
((
param
&
VKD3D_SM1_SWIZZLE_MASK
)
>>
VKD3D_SM1_SWIZZLE_SHIFT
);
src
->
modifiers
=
(
param
&
VKD3D_SM1_SRC_MODIFIER_MASK
)
>>
VKD3D_SM1_SRC_MODIFIER_SHIFT
;
}
...
...
@@ -584,25 +590,7 @@ static void shader_sm1_parse_src_param(struct vkd3d_shader_sm1_parser *sm1, uint
static
void
shader_sm1_parse_dst_param
(
struct
vkd3d_shader_sm1_parser
*
sm1
,
uint32_t
param
,
struct
vkd3d_shader_src_param
*
rel_addr
,
struct
vkd3d_shader_dst_param
*
dst
)
{
enum
vkd3d_shader_register_type
reg_type
;
unsigned
int
index_offset
,
idx_count
;
reg_type
=
parse_register_type
(
sm1
,
param
,
&
index_offset
);
idx_count
=
idx_count_from_reg_type
(
reg_type
);
vsir_register_init
(
&
dst
->
reg
,
reg_type
,
VKD3D_DATA_FLOAT
,
idx_count
);
dst
->
reg
.
precision
=
VKD3D_SHADER_REGISTER_PRECISION_DEFAULT
;
dst
->
reg
.
non_uniform
=
false
;
if
(
idx_count
==
1
)
{
dst
->
reg
.
idx
[
0
].
offset
=
index_offset
+
(
param
&
VKD3D_SM1_REGISTER_NUMBER_MASK
);
dst
->
reg
.
idx
[
0
].
rel_addr
=
rel_addr
;
}
if
(
dst
->
reg
.
type
==
VKD3DSPR_SAMPLER
)
dst
->
reg
.
dimension
=
VSIR_DIMENSION_NONE
;
else
if
(
dst
->
reg
.
type
==
VKD3DSPR_DEPTHOUT
)
dst
->
reg
.
dimension
=
VSIR_DIMENSION_SCALAR
;
else
dst
->
reg
.
dimension
=
VSIR_DIMENSION_VEC4
;
d3dbc_parse_register
(
sm1
,
&
dst
->
reg
,
param
,
rel_addr
);
dst
->
modifiers
=
(
param
&
VKD3D_SM1_DST_MODIFIER_MASK
)
>>
VKD3D_SM1_DST_MODIFIER_SHIFT
;
dst
->
shift
=
(
param
&
VKD3D_SM1_DSTSHIFT_MASK
)
>>
VKD3D_SM1_DSTSHIFT_SHIFT
;
...
...
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