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/builtin_functions.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/builtin_functions.cpp')
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 2905a35..b9dc959 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -4293,7 +4293,7 @@ builtin_builder::_image_prototype(const glsl_type *image_type, image->data.image.write_only = flags & IMAGE_FUNCTION_WRITE_ONLY; image->data.image.coherent = true; image->data.image._volatile = true; - image->data.image._restrict = true; + image->data.image.restrict_flag = true; return sig; } |