summaryrefslogtreecommitdiffstats
path: root/src/glsl/ast_type.cpp
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2014-02-12 16:56:01 +0100
committerFrancisco Jerez <currojerez@riseup.net>2014-02-12 18:44:05 +0100
commit299e869d25c88a3c2da4bd4a6d85ce24684136f0 (patch)
treeb6b2fc7c90e8b2ebe3a463f92b36eccb91c90f90 /src/glsl/ast_type.cpp
parentc116541b2c3a45715de15e3180627263143ad426 (diff)
downloadexternal_mesa3d-299e869d25c88a3c2da4bd4a6d85ce24684136f0.zip
external_mesa3d-299e869d25c88a3c2da4bd4a6d85ce24684136f0.tar.gz
external_mesa3d-299e869d25c88a3c2da4bd4a6d85ce24684136f0.tar.bz2
glsl/ast: Keep track of type qualifiers defined by ARB_shader_image_load_store.
v2: Add comment next to the read_only and write_only qualifier flags. Change temporary copies of the type qualifier mask to use uint64_t too. Reviewed-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src/glsl/ast_type.cpp')
-rw-r--r--src/glsl/ast_type.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index bbc4308..200566c 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -190,6 +190,11 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
if (q.precision != ast_precision_none)
this->precision = q.precision;
+ if (q.flags.q.explicit_image_format) {
+ this->image_format = q.image_format;
+ this->image_base_type = q.image_base_type;
+ }
+
return true;
}