<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 29, 2016 at 6:00 PM, Ilia Mirkin <span dir="ltr"><<a href="mailto:imirkin@alum.mit.edu" target="_blank">imirkin@alum.mit.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I forgot to do this in commit 76b97d544e ("anv: enable storage image<br>
extended formats"). Since both drivers support this now, no need for the<br>
conditional enable.<br>
<br>
Signed-off-by: Ilia Mirkin <<a href="mailto:imirkin@alum.mit.edu">imirkin@alum.mit.edu</a>><br>
---<br>
 src/amd/vulkan/radv_pipeline.c    | 1 -<br>
 src/compiler/spirv/nir_spirv.h    | 1 -<br>
 src/compiler/spirv/spirv_to_<wbr>nir.c | 4 +---<br>
 3 files changed, 1 insertion(+), 5 deletions(-)<br>
<br>
diff --git a/src/amd/vulkan/radv_<wbr>pipeline.c b/src/amd/vulkan/radv_<wbr>pipeline.c<br>
index 25d7805..75785ec 100644<br>
--- a/src/amd/vulkan/radv_<wbr>pipeline.c<br>
+++ b/src/amd/vulkan/radv_<wbr>pipeline.c<br>
@@ -192,7 +192,6 @@ radv_shader_compile_to_nir(<wbr>struct radv_device *device,<br>
                        }<br>
                }<br>
                const struct nir_spirv_supported_extensions supported_ext = {<br>
-                       .storage_image_extended_<wbr>formats = true,<br>
                };<br>
                entry_point = spirv_to_nir(spirv, module->size / 4,<br>
                                           spec_entries, num_spec_entries,<br>
diff --git a/src/compiler/spirv/nir_<wbr>spirv.h b/src/compiler/spirv/nir_<wbr>spirv.h<br>
index d959f3f..e0112ef 100644<br>
--- a/src/compiler/spirv/nir_<wbr>spirv.h<br>
+++ b/src/compiler/spirv/nir_<wbr>spirv.h<br>
@@ -42,7 +42,6 @@ struct nir_spirv_specialization {<br>
 };<br>
<br>
 struct nir_spirv_supported_extensions {<br>
-   bool storage_image_extended_<wbr>formats;<br>
    bool image_ms_array;<br>
 };<br>
<br>
diff --git a/src/compiler/spirv/spirv_to_<wbr>nir.c b/src/compiler/spirv/spirv_to_<wbr>nir.c<br>
index b8acc1e..07980aa 100644<br>
--- a/src/compiler/spirv/spirv_to_<wbr>nir.c<br>
+++ b/src/compiler/spirv/spirv_to_<wbr>nir.c<br>
@@ -2506,6 +2506,7 @@ vtn_handle_preamble_<wbr>instruction(struct vtn_builder *b, SpvOp opcode,<br>
       case SpvCapabilityCullDistance:<br>
       case SpvCapabilityInputAttachment:<br>
       case SpvCapabilityImageGatherExtend<wbr>ed:<br>
+      case SpvCapabilityStorageImageExten<wbr>dedFormats:<br>
          break;<br>
<br>
       case SpvCapabilityGeometryStreams:<br>
@@ -2546,9 +2547,6 @@ vtn_handle_preamble_<wbr>instruction(struct vtn_builder *b, SpvOp opcode,<br>
                   spirv_capability_to_string(<wbr>cap));<br>
          break;<br>
<br>
-      case SpvCapabilityStorageImageExten<wbr>dedFormats:<br>
-         spv_check_supported(storage_<wbr>image_extended_formats, cap);<br>
-         break;<br>
       case SpvCapabilityImageMSArray:<br>
          spv_check_supported(image_ms_<wbr>array, cap);<br>
          break;<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.10.2<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>