[Mesa-dev] [RFC PATCH 11/26] glsl: fix up an assertion in ir_texture::set_sampler()

Samuel Pitoiset samuel.pitoiset at gmail.com
Tue Apr 11 16:48:22 UTC 2017


Used by the builtin functions area.

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

diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp
index 0beae62e99..019fbe11e5 100644
--- a/src/compiler/glsl/ir.cpp
+++ b/src/compiler/glsl/ir.cpp
@@ -1513,7 +1513,7 @@ ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
       assert(type->base_type == GLSL_TYPE_FLOAT);
    } else if (this->op == ir_samples_identical) {
       assert(type == glsl_type::bool_type);
-      assert(sampler->type->is_sampler());
+      assert(sampler->type->is_sampler() || sampler->type->is_bindless_sampler());
       assert(sampler->type->sampler_dimensionality == GLSL_SAMPLER_DIM_MS);
    } else {
       assert(sampler->type->sampled_type == (int) type->base_type);
-- 
2.12.2



More information about the mesa-dev mailing list