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
Merge requests
!1147
vkd3d-shader/preproc: Store argument values per expansion, not per macro.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
vkd3d-shader/preproc: Store argument values per expansion, not per macro.
zfigura/vkd3d:mr2
into
master
Overview
0
Commits
1
Pipelines
3
Changes
4
Merged
Elizabeth Figura
requested to merge
zfigura/vkd3d:mr2
into
master
5 months ago
Overview
0
Commits
1
Pipelines
3
Changes
4
Expand
Merge request reports
Compare
master
version 1
d3fc12ef
5 months ago
master (base)
and
latest version
latest version
aa79bfa6
1 commit,
5 months ago
version 1
d3fc12ef
1 commit,
5 months ago
4 files
+
38
−
35
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
libs/vkd3d-shader/preproc.h
+
2
−
1
Options
@@ -60,6 +60,7 @@ struct preproc_expansion
{
struct
preproc_buffer
buffer
;
const
struct
preproc_text
*
text
;
struct
preproc_text
*
arg_values
;
/* Back-pointer to the macro, if this expansion a macro body. This is
* necessary so that argument tokens can be correctly replaced. */
struct
preproc_macro
*
macro
;
@@ -72,7 +73,6 @@ struct preproc_macro
char
**
arg_names
;
size_t
arg_count
;
struct
preproc_text
*
arg_values
;
struct
preproc_text
body
;
};
@@ -117,6 +117,7 @@ struct preproc_ctx
STATE_ARGS
,
}
state
;
unsigned
int
paren_depth
;
struct
preproc_text
*
arg_values
;
}
text_func
,
directive_func
;
int
current_directive
;
Loading