glsl: allow bindless samplers/images as function return

The ARB_bindless_texture spec doesn't clearly state this, but as
it says "Replace Section 4.1.7 (Samplers), p. 25" and,
"Replace Section 4.1.X, (Images)", this should be allowed.

v3: - add spec comment
    - update the glsl error message

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index bed07dcbcaa9e0da7f390123614382762012b14c..1c18c7b9c04a866a1cb1320497742beab7f5f582 100644 (file)
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -5764,12 +5764,17 @@ ast_function::hir(exec_list *instructions,
     *
     *    "[Opaque types] can only be declared as function parameters
     *     or uniform-qualified variables."
     *
     *    "[Opaque types] can only be declared as function parameters
     *     or uniform-qualified variables."

+    *
+    * The ARB_bindless_texture spec doesn't clearly state this, but as it says
+    * "Replace Section 4.1.7 (Samplers), p. 25" and, "Replace Section 4.1.X,
+    * (Images)", this should be allowed.

     */
     */

-   if (return_type->contains_opaque()) {
+   if (return_type->contains_atomic() ||
+       (!state->has_bindless() && return_type->contains_opaque())) {

       YYLTYPE loc = this->get_location();
       _mesa_glsl_error(&loc, state,
       YYLTYPE loc = this->get_location();
       _mesa_glsl_error(&loc, state,

-                       "function `%s' return type can't contain an opaque type",
-                       name);
+                       "function `%s' return type can't contain an %s type",
+                       name, state->has_bindless() ? "atomic" : "opaque");

    }
 
    /**/
    }
 
    /**/