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

glsl: allow bindless samplers/images to be initialized

Browse Source 
From section 4.1.7 of the ARB_bindless_texture spec:

   "Samplers may be declared as shader inputs and outputs, as uniform
    variables, as temporary variables, and as function parameters."

From section 4.1.X of the ARB_bindless_texture spec:

   "Images may be declared as shader inputs and outputs, as uniform
    variables, as temporary variables, and as function parameters."

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-21 19:27:16 +02:00
parent efb668fb29
commit 35c8e727a5
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4333,11 +4333,22 @@ process_initializer(ir_variable *var, ast_declaration *decl,
* "Opaque variables [...] are initialized only through the * "Opaque variables [...] are initialized only through the
* OpenGL API; they cannot be declared with an initializer in a * OpenGL API; they cannot be declared with an initializer in a
* shader." * shader."
*
* From section 4.1.7 of the ARB_bindless_texture spec:
*
* "Samplers may be declared as shader inputs and outputs, as uniform
* variables, as temporary variables, and as function parameters."
*
* From section 4.1.X of the ARB_bindless_texture spec:
*
* "Images may be declared as shader inputs and outputs, as uniform
* variables, as temporary variables, and as function parameters."
*/ */
if (var->type->contains_opaque()) { if (var->type->contains_atomic() ||
(!state->has_bindless() && var->type->contains_opaque())) {
_mesa_glsl_error(&initializer_loc, state, _mesa_glsl_error(&initializer_loc, state,
"cannot initialize opaque variable %s", "cannot initialize %s variable %s",
var->name); var->name, state->has_bindless() ? "atomic" : "opaque");
} }
if ((var->data.mode == ir_var_shader_in) && (state->current_function == NULL)) { if ((var->data.mode == ir_var_shader_in) && (state->current_function == NULL)) {