diff options
| author | Brian Paul <brianp@vmware.com> | 2014-02-12 13:22:27 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-02-12 13:37:09 -0700 |
| commit | 248606a5f065b88ee6328c233e54f163088de5d5 (patch) | |
| tree | 8272721b2b5492ebae58aff2b7f6423db26b8462 /src/glsl/ir.cpp | |
| parent | fd0620ff6c2c629e4888f4c98cfd6655adbfb69e (diff) | |
| download | external_mesa3d-248606a5f065b88ee6328c233e54f163088de5d5.zip external_mesa3d-248606a5f065b88ee6328c233e54f163088de5d5.tar.gz external_mesa3d-248606a5f065b88ee6328c233e54f163088de5d5.tar.bz2 | |
glsl: rename _restrict to restrict_flag
To fix MSVC compile breakage. Evidently, _restrict is an MSVC keyword,
though the docs only mention __restrict (with two underscores).
Note: we may want to also rename _volatile to volatile_flag to be
consistent.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74900
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/ir.cpp')
| -rw-r--r-- | src/glsl/ir.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp index 338f61b..a41eddf 100644 --- a/src/glsl/ir.cpp +++ b/src/glsl/ir.cpp @@ -1558,7 +1558,7 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name, this->data.image.write_only = false; this->data.image.coherent = false; this->data.image._volatile = false; - this->data.image._restrict = false; + this->data.image.restrict_flag = false; if (type != NULL) { if (type->base_type == GLSL_TYPE_SAMPLER) @@ -1668,7 +1668,7 @@ ir_function_signature::qualifiers_match(exec_list *params) a->data.image.write_only != b->data.image.write_only || a->data.image.coherent != b->data.image.coherent || a->data.image._volatile != b->data.image._volatile || - a->data.image._restrict != b->data.image._restrict) { + a->data.image.restrict_flag != b->data.image.restrict_flag) { /* parameter a's qualifiers don't match */ return a->name; |