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
88f85ffb
Commit
88f85ffb
authored
1 year ago
by
Elizabeth Figura
Committed by
Alexandre Julliard
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader: Add constant buffer size to struct vkd3d_shader_descriptor_info1.
parent
8c465c81
No related branches found
No related tags found
1 merge request
!304
vkd3d-shader: Extend vkd3d_shader_scan_descriptor_info, part 2/2.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libs/vkd3d-shader/vkd3d_shader_main.c
+12
-4
12 additions, 4 deletions
libs/vkd3d-shader/vkd3d_shader_main.c
libs/vkd3d-shader/vkd3d_shader_private.h
+1
-0
1 addition, 0 deletions
libs/vkd3d-shader/vkd3d_shader_private.h
with
13 additions
and
4 deletions
libs/vkd3d-shader/vkd3d_shader_main.c
+
12
−
4
View file @
88f85ffb
...
...
@@ -788,12 +788,15 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc
const
struct
vkd3d_shader_instruction
*
instruction
)
{
const
struct
vkd3d_shader_constant_buffer
*
cb
=
&
instruction
->
declaration
.
cb
;
struct
vkd3d_shader_descriptor_info1
*
d
;
if
(
!
context
->
scan_descriptor_info
)
return
;
vkd3d_shader_scan_add_descriptor
(
context
,
VKD3D_SHADER_DESCRIPTOR_TYPE_CBV
,
&
cb
->
src
.
reg
,
&
cb
->
range
,
VKD3D_SHADER_RESOURCE_BUFFER
,
VKD3D_SHADER_RESOURCE_DATA_UINT
);
if
(
!
(
d
=
vkd3d_shader_scan_add_descriptor
(
context
,
VKD3D_SHADER_DESCRIPTOR_TYPE_CBV
,
&
cb
->
src
.
reg
,
&
cb
->
range
,
VKD3D_SHADER_RESOURCE_BUFFER
,
VKD3D_SHADER_RESOURCE_DATA_UINT
)))
return
;
d
->
buffer_size
=
cb
->
size
*
16
;
}
static
void
vkd3d_shader_scan_sampler_declaration
(
struct
vkd3d_shader_scan_context
*
context
,
...
...
@@ -1153,12 +1156,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
parser
->
shader_desc
.
flat_constant_count
);
++
i
)
{
unsigned
int
size
=
parser
->
shader_desc
.
flat_constant_count
[
i
].
external
;
struct
vkd3d_shader_register_range
range
=
{.
space
=
0
,
.
first
=
i
,
.
last
=
i
};
struct
vkd3d_shader_register
reg
=
{.
idx
[
0
].
offset
=
i
,
.
idx_count
=
1
};
struct
vkd3d_shader_descriptor_info1
*
d
;
if
(
parser
->
shader_desc
.
flat_constant_count
[
i
].
external
)
vkd3d_shader_scan_add_descriptor
(
&
context
,
VKD3D_SHADER_DESCRIPTOR_TYPE_CBV
,
&
reg
,
&
range
,
VKD3D_SHADER_RESOURCE_BUFFER
,
VKD3D_SHADER_RESOURCE_DATA_UINT
);
{
if
((
d
=
vkd3d_shader_scan_add_descriptor
(
&
context
,
VKD3D_SHADER_DESCRIPTOR_TYPE_CBV
,
&
reg
,
&
range
,
VKD3D_SHADER_RESOURCE_BUFFER
,
VKD3D_SHADER_RESOURCE_DATA_UINT
)))
d
->
buffer_size
=
size
*
16
;
}
}
if
(
!
ret
&&
signature_info
)
...
...
This diff is collapsed.
Click to expand it.
libs/vkd3d-shader/vkd3d_shader_private.h
+
1
−
0
View file @
88f85ffb
...
...
@@ -1123,6 +1123,7 @@ struct vkd3d_shader_descriptor_info1
enum
vkd3d_shader_resource_data_type
resource_data_type
;
unsigned
int
flags
;
unsigned
int
sample_count
;
unsigned
int
buffer_size
;
unsigned
int
count
;
};
...
...
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