Merge remote-tracking branch 'origin/master' into vulkan

[mesa.git] / src / compiler / nir_types.h

diff --git a/src/compiler/nir_types.h b/src/compiler/nir_types.h
index 4ef0dcf9a310ef8453b29ff2b1fbeb3c9cbc2c5f..d92605bf4fb99639a76e901f333f1d37925691c2 100644 (file)
--- a/src/compiler/nir_types.h
+++ b/src/compiler/nir_types.h
@@ -113,6 +113,7 @@ const struct glsl_type *glsl_struct_type(const struct glsl_struct_field *fields,
 const struct glsl_type *glsl_sampler_type(enum glsl_sampler_dim dim,
                                           bool is_shadow, bool is_array,
                                           enum glsl_base_type base_type);
+const struct glsl_type *glsl_bare_sampler_type();
 const struct glsl_type *glsl_image_type(enum glsl_sampler_dim dim,
                                         bool is_array,
                                         enum glsl_base_type base_type);