From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 19 Apr 2017 14:44:19 +0000 (+0200)
Subject: glsl: allow bindless images to be declared inside structures
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=48b7882200c58d90b844162cac5a791f8d35e23b;p=mesa.git

glsl: allow bindless images to be declared inside structures

The spec doesn't clearly state this, but I have got clarification
from the spec authors.

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 25e473c814c..5ee7d9aaab3 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -6989,7 +6989,7 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
             _mesa_glsl_error(&loc, state, "atomic counter in structure");
          }
 
-         if (decl_type->contains_image()) {
+         if (!state->has_bindless() && decl_type->contains_image()) {
             /* FINISHME: Same problem as with atomic counters.
              * FINISHME: Request clarification from Khronos and add
              * FINISHME: spec quotation here.