OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: allow bindless samplers/images as function return

Browse Source 
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>
This commit is contained in:
Samuel Pitoiset
2017-04-19 16:40:38 +02:00
parent cb405f170b
commit 75cc83747e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -5764,12 +5764,17 @@ ast_function::hir(exec_list *instructions,
* *
* "[Opaque types] can only be declared as function parameters * "[Opaque types] can only be declared as function parameters
* or uniform-qualified variables." * 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(); YYLTYPE loc = this->get_location();
_mesa_glsl_error(&loc, state, _mesa_glsl_error(&loc, state,
"function `%s' return type can't contain an opaque type", "function `%s' return type can't contain an %s type",
name); name, state->has_bindless() ? "atomic" : "opaque");
} }
/**/ /**/