[Mesa-dev] [PATCH 11/13] i965/fs_surface_builder: Explicitly handle FORMAT_NONE in num_image_coordinates

[Jason Ekstrand]

Previously, we were relying on has_matching_typed_format returning true for
MESA_FORMAT_NONE which, in turn, relied on _mesa_get_format_bytes returning
1 for MESA_FORMAT_NONE.  When we switch to ISL, this behaviour will no
longer be something we can rely on.
---
 src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
index 04d1cd2..0932336 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
@@ -410,6 +410,7 @@ namespace {
           * reads want the array index to be at the Z component.
           */
          const bool array_index_at_z =
+            format != MESA_FORMAT_NONE &&
             !image_format_info::has_matching_typed_format(
                bld.shader->devinfo, format);
          const unsigned zero_dims =
-- 
2.5.0.400.gff86faf