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. All of this is extremely non-obvious. Instead, this commit makes us handle it explicitly. --- 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 534d849..31ecb5b 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp @@ -409,6 +409,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 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev