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
414bb995
Commit
414bb995
authored
3 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/glsl: Add vkd3d-shader version information to the generated shader.
parent
3205e08f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!803
vkd3d-shader/glsl: Add vkd3d-shader version information to the generated shader.
Pipeline
#25434
skipped
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/vkd3d-shader/glsl.c
+16
-12
16 additions, 12 deletions
libs/vkd3d-shader/glsl.c
with
16 additions
and
12 deletions
libs/vkd3d-shader/glsl.c
+
16
−
12
View file @
414bb995
...
...
@@ -89,35 +89,39 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator
}
}
static
int
vkd3d_glsl_generator_generate
(
struct
vkd3d_glsl_generator
*
gen
erator
,
struct
vkd3d_shader_code
*
out
)
static
int
vkd3d_glsl_generator_generate
(
struct
vkd3d_glsl_generator
*
gen
,
struct
vkd3d_shader_code
*
out
)
{
const
struct
vkd3d_shader_instruction_array
*
instructions
=
&
generator
->
program
->
instructions
;
const
struct
vkd3d_shader_instruction_array
*
instructions
=
&
gen
->
program
->
instructions
;
struct
vkd3d_string_buffer
*
buffer
=
&
gen
->
buffer
;
unsigned
int
i
;
void
*
code
;
ERR
(
"Generating a GLSL shader. This is unsupported; you get to keep all the pieces if it breaks.
\n
"
);
vkd3d_string_buffer_printf
(
&
generator
->
buffer
,
"#version 440
\n\n
"
);
vkd3d_string_buffer_printf
(
&
generator
->
buffer
,
"void main()
\n
{
\n
"
);
vkd3d_string_buffer_printf
(
buffer
,
"#version 440
\n\n
"
);
++
generator
->
indent
;
vkd3d_string_buffer_printf
(
buffer
,
"/* Generated by %s. */
\n\n
"
,
vkd3d_shader_get_version
(
NULL
,
NULL
));
vkd3d_string_buffer_printf
(
buffer
,
"void main()
\n
{
\n
"
);
++
gen
->
indent
;
for
(
i
=
0
;
i
<
instructions
->
count
;
++
i
)
{
vkd3d_glsl_handle_instruction
(
gen
erator
,
&
instructions
->
elements
[
i
]);
vkd3d_glsl_handle_instruction
(
gen
,
&
instructions
->
elements
[
i
]);
}
vkd3d_string_buffer_printf
(
&
generator
->
buffer
,
"}
\n
"
);
vkd3d_string_buffer_printf
(
buffer
,
"}
\n
"
);
if
(
TRACE_ON
())
vkd3d_string_buffer_trace
(
&
generator
->
buffer
);
vkd3d_string_buffer_trace
(
buffer
);
if
(
gen
erator
->
failed
)
if
(
gen
->
failed
)
return
VKD3D_ERROR_INVALID_SHADER
;
if
((
code
=
vkd3d_malloc
(
generator
->
buffer
.
buffer_size
)))
if
((
code
=
vkd3d_malloc
(
buffer
->
buffer_size
)))
{
memcpy
(
code
,
generator
->
buffer
.
buffer
,
generator
->
buffer
.
content_size
);
out
->
size
=
generator
->
buffer
.
content_size
;
memcpy
(
code
,
buffer
->
buffer
,
buffer
->
content_size
);
out
->
size
=
buffer
->
content_size
;
out
->
code
=
code
;
}
else
return
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