Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vkd3d
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Francisco Casas
vkd3d
Commits
a06320c1
Commit
a06320c1
authored
2 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/dxbc: Pass a vkd3d_shader_code structure to parse_dxbc().
parent
2f762465
No related branches found
Branches containing commit
Tags
wine-0.9.54
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/vkd3d-shader/dxbc.c
+6
-4
6 additions, 4 deletions
libs/vkd3d-shader/dxbc.c
with
6 additions
and
4 deletions
libs/vkd3d-shader/dxbc.c
+
6
−
4
View file @
a06320c1
...
...
@@ -1725,12 +1725,14 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o
return
data
+
offset
;
}
static
int
parse_dxbc
(
const
char
*
data
,
size_t
data_size
,
static
int
parse_dxbc
(
const
struct
vkd3d_shader_code
*
dxbc
,
struct
vkd3d_shader_message_context
*
message_context
,
const
char
*
source_name
,
int
(
*
section_handler
)(
const
struct
vkd3d_shader_dxbc_section_desc
*
section
,
void
*
ctx
),
void
*
ctx
)
{
const
struct
vkd3d_shader_location
location
=
{.
source_name
=
source_name
};
uint32_t
checksum
[
4
],
calculated_checksum
[
4
];
const
char
*
data
=
dxbc
->
code
;
size_t
data_size
=
dxbc
->
size
;
const
char
*
ptr
=
data
;
int
ret
=
VKD3D_OK
;
uint32_t
chunk_count
;
...
...
@@ -1941,7 +1943,7 @@ int shader_parse_input_signature(const struct vkd3d_shader_code *dxbc,
int
ret
;
memset
(
signature
,
0
,
sizeof
(
*
signature
));
if
((
ret
=
parse_dxbc
(
dxbc
->
code
,
dxbc
->
size
,
message_context
,
NULL
,
isgn_handler
,
signature
))
<
0
)
if
((
ret
=
parse_dxbc
(
dxbc
,
message_context
,
NULL
,
isgn_handler
,
signature
))
<
0
)
ERR
(
"Failed to parse input signature.
\n
"
);
return
ret
;
...
...
@@ -2030,7 +2032,7 @@ static int shader_extract_from_dxbc(const struct vkd3d_shader_code *dxbc,
memset
(
&
desc
->
output_signature
,
0
,
sizeof
(
desc
->
output_signature
));
memset
(
&
desc
->
patch_constant_signature
,
0
,
sizeof
(
desc
->
patch_constant_signature
));
ret
=
parse_dxbc
(
dxbc
->
code
,
dxbc
->
size
,
message_context
,
source_name
,
shdr_handler
,
desc
);
ret
=
parse_dxbc
(
dxbc
,
message_context
,
source_name
,
shdr_handler
,
desc
);
if
(
!
desc
->
byte_code
)
ret
=
VKD3D_ERROR_INVALID_ARGUMENT
;
...
...
@@ -2559,7 +2561,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc,
*
messages
=
NULL
;
vkd3d_shader_message_context_init
(
&
message_context
,
VKD3D_SHADER_LOG_INFO
);
ret
=
parse_dxbc
(
dxbc
->
code
,
dxbc
->
size
,
&
message_context
,
NULL
,
rts0_handler
,
root_signature
);
ret
=
parse_dxbc
(
dxbc
,
&
message_context
,
NULL
,
rts0_handler
,
root_signature
);
vkd3d_shader_message_context_trace_messages
(
&
message_context
);
if
(
!
vkd3d_shader_message_context_copy_messages
(
&
message_context
,
messages
))
ret
=
VKD3D_ERROR_OUT_OF_MEMORY
;
...
...
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