Mesa (master): nir/spirv: do not require a format with images that are not sampled

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 5c6eaa1421bd6f95437f00629c09b8ddf7c39ed8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c6eaa1421bd6f95437f00629c09b8ddf7c39ed8

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Tue Feb 14 11:32:18 2017 +0100

nir/spirv: do not require a format with images that are not sampled

As soon as we support shaderStorageImageWriteWithoutFormat we can see
write-only images (sampled == 2) that don't have a format specified.

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/compiler/spirv/spirv_to_nir.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 416e12a..db3a19f 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -874,8 +874,6 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
          val->type->type = glsl_sampler_type(dim, is_shadow, is_array,
                                              glsl_get_base_type(sampled_type));
       } else if (sampled == 2) {
-         assert((dim == GLSL_SAMPLER_DIM_SUBPASS ||
-                 dim == GLSL_SAMPLER_DIM_SUBPASS_MS) || format);
          assert(!is_shadow);
          val->type->type = glsl_image_type(dim, is_array,
                                            glsl_get_base_type(sampled_type));