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
374c5fcb
Commit
374c5fcb
authored
1 year ago
by
Henri Verbeet
Committed by
Alexandre Julliard
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/glsl: Store a pointer to the vsir program in struct vkd3d_glsl_generator.
parent
5f1f7aba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!716
vkd3d-shader/glsl: Store a pointer to the vsir program in struct vkd3d_glsl_generator.
Pipeline
#23839
skipped
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/vkd3d-shader/glsl.c
+10
-10
10 additions, 10 deletions
libs/vkd3d-shader/glsl.c
with
10 additions
and
10 deletions
libs/vkd3d-shader/glsl.c
+
10
−
10
View file @
374c5fcb
...
...
@@ -20,7 +20,7 @@
struct
vkd3d_glsl_generator
{
struct
v
kd3d_shader_version
version
;
struct
v
sir_program
*
program
;
struct
vkd3d_string_buffer
buffer
;
struct
vkd3d_shader_location
location
;
struct
vkd3d_shader_message_context
*
message_context
;
...
...
@@ -42,7 +42,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error(
static
void
shader_glsl_ret
(
struct
vkd3d_glsl_generator
*
generator
,
const
struct
vkd3d_shader_instruction
*
ins
)
{
const
struct
vkd3d_shader_version
*
version
=
&
generator
->
version
;
const
struct
vkd3d_shader_version
*
version
=
&
generator
->
program
->
shader_
version
;
/*
* TODO: Implement in_subroutine
...
...
@@ -76,9 +76,9 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator
}
}
static
int
vkd3d_glsl_generator_generate
(
struct
vkd3d_glsl_generator
*
generator
,
struct
vsir_program
*
program
,
struct
vkd3d_shader_code
*
out
)
static
int
vkd3d_glsl_generator_generate
(
struct
vkd3d_glsl_generator
*
generator
,
struct
vkd3d_shader_code
*
out
)
{
const
struct
vkd3d_shader_instruction_array
*
instructions
=
&
generator
->
program
->
instructions
;
unsigned
int
i
;
void
*
code
;
...
...
@@ -87,9 +87,9 @@ static int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator,
vkd3d_string_buffer_printf
(
&
generator
->
buffer
,
"#version 440
\n\n
"
);
vkd3d_string_buffer_printf
(
&
generator
->
buffer
,
"void main()
\n
{
\n
"
);
for
(
i
=
0
;
i
<
program
->
instructions
.
count
;
++
i
)
for
(
i
=
0
;
i
<
instructions
->
count
;
++
i
)
{
vkd3d_glsl_handle_instruction
(
generator
,
&
program
->
instructions
.
elements
[
i
]);
vkd3d_glsl_handle_instruction
(
generator
,
&
instructions
->
elements
[
i
]);
}
if
(
generator
->
failed
)
...
...
@@ -114,10 +114,10 @@ static void vkd3d_glsl_generator_cleanup(struct vkd3d_glsl_generator *gen)
}
static
void
vkd3d_glsl_generator_init
(
struct
vkd3d_glsl_generator
*
gen
,
const
struct
v
kd3d_shader_version
*
version
,
struct
vkd3d_shader_message_context
*
message_context
)
struct
v
sir_program
*
program
,
struct
vkd3d_shader_message_context
*
message_context
)
{
memset
(
gen
,
0
,
sizeof
(
*
gen
));
gen
->
version
=
*
version
;
gen
->
program
=
program
;
vkd3d_string_buffer_init
(
&
gen
->
buffer
);
gen
->
message_context
=
message_context
;
}
...
...
@@ -128,8 +128,8 @@ int glsl_compile(struct vsir_program *program, struct vkd3d_shader_code *out,
struct
vkd3d_glsl_generator
generator
;
int
ret
;
vkd3d_glsl_generator_init
(
&
generator
,
&
program
->
shader_version
,
message_context
);
ret
=
vkd3d_glsl_generator_generate
(
&
generator
,
program
,
out
);
vkd3d_glsl_generator_init
(
&
generator
,
program
,
message_context
);
ret
=
vkd3d_glsl_generator_generate
(
&
generator
,
out
);
vkd3d_glsl_generator_cleanup
(
&
generator
);
return
ret
;
...
...
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