[Mesa-dev] [PATCH v2 26/31] glsl: allow bindless samplers/images to be used with constructors

[Samuel Pitoiset]

For the explicit conversions.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/compiler/glsl/ast_function.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp
index 6ec5eda043..9aac9c51e4 100644
--- a/src/compiler/glsl/ast_function.cpp
+++ b/src/compiler/glsl/ast_function.cpp
@@ -1969,7 +1969,8 @@ ast_function_expression::hir(exec_list *instructions,
 
       /* Constructors for opaque types are illegal.
        */
-      if (constructor_type->contains_opaque()) {
+      if (constructor_type->contains_atomic() ||
+          (!state->has_bindless() && constructor_type->contains_opaque())) {
          _mesa_glsl_error(& loc, state, "cannot construct opaque type `%s'",
                           constructor_type->name);
          return ir_rvalue::error_value(ctx);
-- 
2.12.2