diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2013-11-25 14:03:06 -0800 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2014-02-12 18:43:37 +0100 |
| commit | 107d03a6d5b63687361b2b4d2876ef52b082cbb5 (patch) | |
| tree | d324b5e64917a4deb3f282a5112e2205454210fd /src/glsl/builtin_functions.cpp | |
| parent | 8a2508ee0726b349318c1e05122edbe5a545480a (diff) | |
| download | external_mesa3d-107d03a6d5b63687361b2b4d2876ef52b082cbb5.zip external_mesa3d-107d03a6d5b63687361b2b4d2876ef52b082cbb5.tar.gz external_mesa3d-107d03a6d5b63687361b2b4d2876ef52b082cbb5.tar.bz2 | |
glsl: Add helper methods to glsl_type for dealing with images.
Add predicates to query if a GLSL type is or contains an image.
Rename sampler_coordinate_components() to coordinate_components().
v2: Use assert instead of unreachable.
v3: No need to use a separate code-path for images in
coordinate_components() after merging image and sampler fields in
the glsl_type structure.
Reviewed-by: Paul Berry <stereotype441@gmail.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 2162baa..4ff2212 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -3549,7 +3549,7 @@ builtin_builder::_texture(ir_texture_opcode opcode, ir_texture *tex = new(mem_ctx) ir_texture(opcode); tex->set_sampler(var_ref(s), return_type); - const int coord_size = sampler_type->sampler_coordinate_components(); + const int coord_size = sampler_type->coordinate_components(); if (coord_size == coord_type->vector_elements) { tex->coordinate = var_ref(P); |