Housekeeping. Fixed ~400 piglit regressions

4 files changed, 172 insertions, 149 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index 6ad0063000..11fb5253b0 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -437,6 +437,8 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
        /* one image slice, nothing special needs to be done */
        break;
     case GL_TEXTURE_1D:
+       DBG("%s: GL_TEXTURE_1D not yet supported\n", __FUNCTION__);
+       return false;
        break;
     case GL_TEXTURE_1D_ARRAY:
        numSlices = height;
@@ -448,10 +450,14 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
        depth = 1;
        break;
     case GL_TEXTURE_3D:
+       DBG("%s: GL_TEXTURE_3D not yet supported\n", __FUNCTION__);
+       return false;
        /* we'll store 3D images as a series of slices */
        numSlices = depth;
        break;
     case GL_TEXTURE_CUBE_MAP_ARRAY:
+       DBG("%s: GL_TEXTURE_CUBE_MAP_ARRAY not yet supported\n", __FUNCTION__);
+       return false;
        numSlices = depth;
        break;
     default:
@@ -2790,10 +2796,10 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
    }
 
    /* blorp lies about some formats to placate the GPU. */
-   blorp_process_format format_process_flags;
+   blorp_process_format src_format_process_flags;
    BRW_SURFACE sample_format;
-   translate_tex_format(brw, src_format, 0, &format_process_flags, 0, &sample_format);
-   if (format_process_flags & sample_not_supported_mask) {
+   translate_tex_format(brw, src_format, 0, &src_format_process_flags, 0, &sample_format);
+   if (src_format_process_flags & sample_not_supported_mask) {
       _mesa_debug(ctx, "%s: compatible brw_surface format not found for source "
                  "texture mip tree. Source: %s\n",
                  __FUNCTION__, _mesa_get_format_name(src_format));
@@ -2805,15 +2811,32 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
       return false;
    }
 
+   blorp_process_format dst_format_process_flags;
    BRW_SURFACE render_format;
-   translate_tex_format(brw, dst_format, 0, &format_process_flags, &render_format, 0);
+   translate_tex_format(brw, dst_format, 0, &dst_format_process_flags, &render_format, 0);
    if (!brw_format_for_render(brw, render_format) ||
-       (format_process_flags & render_not_supported_mask)) {
+       (dst_format_process_flags & render_not_supported_mask)) {
       _mesa_debug(ctx, "%s: The translated target miptree format is not supported as a render target: %s: 0x%x.\n",
                  __FUNCTION__, _mesa_get_format_name(dst_format), render_format);
       return false;
    }
 
+   if ((alpha_blend_render & src_format_process_flags) ||
+       (alpha_blend_render & dst_format_process_flags)) {
+      gl_format linear_src_format = _mesa_get_srgb_format_linear(src_format);
+      gl_format linear_dst_format = _mesa_get_srgb_format_linear(dst_format);
+
+      if (linear_src_format != linear_dst_format &&
+          ((linear_src_format == MESA_FORMAT_ARGB8888 &&
+           linear_dst_format != MESA_FORMAT_XRGB8888) ||
+          (linear_dst_format == MESA_FORMAT_XRGB8888 &&
+           linear_src_format != MESA_FORMAT_ARGB8888))) {
+         _mesa_debug(ctx, "%s: Blorp doesn't yet support RGBX formats except blts to or from RGBA: dst: %s: src: %s.\n",
+                    __FUNCTION__, _mesa_get_format_name(dst_format), _mesa_get_format_name(src_format));
+          return false;
+      }
+   }
+
    GLenum baseSourceFormat = _mesa_get_format_base_format(src_format);
    GLenum baseDestinationFormat = _mesa_get_format_base_format(dst_format);
 
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index b950acf7f0..60e3ac4d9b 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -213,7 +213,7 @@ typedef enum {
    sample_swizzle_xy = sample_swizzle_x | sample_swizzle_y,
    sample_swizzle_xyz = sample_swizzle_x | sample_swizzle_y | sample_swizzle_z,
    sample_swizzle_yzw = sample_swizzle_y | sample_swizzle_z | sample_swizzle_w,
-   render_not_supported_mask = alpha_blend_render | blorp_shadow_shader,
+   render_not_supported_mask = blorp_shadow_shader,
    sample_not_supported_mask = scale_mask | sample_swizzle_mask |
                         sample_scale | desktop_gl_sel
 } blorp_process_format;
diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h
index bfb2f70abc..18934389b9 100644
--- a/src/mesa/drivers/dri/i965/brw_defines.h
+++ b/src/mesa/drivers/dri/i965/brw_defines.h
@@ -489,7 +489,7 @@
 #define BRW_SURFACE_FORMAT_SHIFT	18
 #define BRW_SURFACE_FORMAT_MASK		INTEL_MASK(26, 18)
 
-#define BRW_SURFACE_FORMAT_NONE 0Xffff
+#define BRW_SURFACEFORMAT_NONE 0Xffff
 typedef u_int16_t BRW_SURFACE;
 
 #define BRW_SURFACERETURNFORMAT_FLOAT32  0
diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index 0e6c8c5a61..ef0e95ebe7 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -310,25 +310,25 @@ const struct surface_format_info surface_formats[] = {
 bool
 brw_format_for_blend(struct brw_context *brw, const BRW_SURFACE brw_surface_sel)
 {
-   return BRW_SURFACE_FORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].alpha_blend <= brw->gen_high);
+   return BRW_SURFACEFORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].alpha_blend <= brw->gen_high);
 }
 
 bool
 brw_format_for_filter(struct brw_context *brw, const BRW_SURFACE brw_surface_sel)
 {
-   return BRW_SURFACE_FORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].filtering <= brw->gen_high);
+   return BRW_SURFACEFORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].filtering <= brw->gen_high);
 }
 
 bool
 brw_format_for_render(struct brw_context *brw, const BRW_SURFACE brw_surface_sel)
 {
-   return BRW_SURFACE_FORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].render_target <= brw->gen_high);
+   return BRW_SURFACEFORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].render_target <= brw->gen_high);
 }
 
 bool
 brw_format_for_sampling(struct brw_context *brw, const BRW_SURFACE brw_surface_sel)
 {
-   return BRW_SURFACE_FORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].sampling <= brw->gen_high);
+   return BRW_SURFACEFORMAT_NONE != brw_surface_sel && (surface_formats[brw_surface_sel].sampling <= brw->gen_high);
 }
 
 #undef x
@@ -352,7 +352,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
     */
    static const struct format_translator table[MESA_PRIVATE_FORMAT_COUNT] =
    {
-      [MESA_FORMAT_RGBA8888] = {BRW_SURFACE_FORMAT_NONE,             /* shadow render target */
+      [MESA_FORMAT_RGBA8888] = {BRW_SURFACEFORMAT_NONE,              /* shadow render target */
                                 BRW_SURFACEFORMAT_R8G8B8A8_UNORM,    /* shadow sample target */
                                 sample_swizzle_all},                        /* gl_format to brw surface processing */
       [MESA_FORMAT_RGBA8888_REV] = {BRW_SURFACEFORMAT_R8G8B8A8_UNORM,
@@ -361,64 +361,64 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_ARGB8888] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                                 BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                                 0},
-      [MESA_FORMAT_ARGB8888_REV] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
+      [MESA_FORMAT_ARGB8888_REV] = {BRW_SURFACEFORMAT_NONE,
                                     BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                                     sample_swizzle_all},
-      [MESA_FORMAT_RGBX8888] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
-                                BRW_SURFACEFORMAT_R8G8B8X8_UNORM,
-                                alpha_blend_render | sample_swizzle_all},
+      [MESA_FORMAT_RGBX8888] = {BRW_SURFACEFORMAT_NONE,
+                                BRW_SURFACEFORMAT_B8G8R8X8_UNORM,
+                                sample_swizzle_all},
       [MESA_FORMAT_RGBX8888_REV] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                                     BRW_SURFACEFORMAT_B8G8R8X8_UNORM,
                                     alpha_blend_render},
       [MESA_FORMAT_XRGB8888] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                                 BRW_SURFACEFORMAT_B8G8R8X8_UNORM,
                                 alpha_blend_render},
-      [MESA_FORMAT_XRGB8888_REV] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
+      [MESA_FORMAT_XRGB8888_REV] = {BRW_SURFACEFORMAT_NONE,
                                     BRW_SURFACEFORMAT_B8G8R8X8_UNORM,
-                                    alpha_blend_render | sample_swizzle_all},
-      [MESA_FORMAT_RGB888] = {BRW_SURFACE_FORMAT_NONE,
+                                    sample_swizzle_all},
+      [MESA_FORMAT_RGB888] = {BRW_SURFACEFORMAT_NONE,
                               BRW_SURFACEFORMAT_R8_UNORM,
                               sample_scale},
-      [MESA_FORMAT_BGR888] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_BGR888] = {BRW_SURFACEFORMAT_NONE,
                               BRW_SURFACEFORMAT_R8_UNORM,
                               sample_scale},
       [MESA_FORMAT_RGB565] = {BRW_SURFACEFORMAT_B5G6R5_UNORM,
                               BRW_SURFACEFORMAT_B5G6R5_UNORM,
                               0},
-      [MESA_FORMAT_RGB565_REV] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB565_REV] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_B5G6R5_UNORM,
                                   sample_swizzle_xyz},
       [MESA_FORMAT_ARGB4444] = {BRW_SURFACEFORMAT_B4G4R4A4_UNORM,
                                 BRW_SURFACEFORMAT_B4G4R4A4_UNORM,
                                 0},
-      [MESA_FORMAT_ARGB4444_REV] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ARGB4444_REV] = {BRW_SURFACEFORMAT_NONE,
                                     BRW_SURFACEFORMAT_B4G4R4A4_UNORM,
                                     sample_swizzle_all},
-      [MESA_FORMAT_RGBA5551] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGBA5551] = {BRW_SURFACEFORMAT_NONE,
                                 BRW_SURFACEFORMAT_B5G5R5A1_UNORM,
                                 sample_swizzle_all},
       [MESA_FORMAT_ARGB1555] = {BRW_SURFACEFORMAT_B5G5R5A1_UNORM,
                                 BRW_SURFACEFORMAT_B5G5R5A1_UNORM,
                                 0},
-      [MESA_FORMAT_ARGB1555_REV] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ARGB1555_REV] = {BRW_SURFACEFORMAT_NONE,
                                     BRW_SURFACEFORMAT_B5G5R5A1_UNORM,
                                     sample_swizzle_yzw},
-      [MESA_FORMAT_AL44] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_AL44] = {BRW_SURFACEFORMAT_NONE,
                             BRW_SURFACEFORMAT_R8G8_UNORM,
                             scale_x},
-      [MESA_FORMAT_AL88] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_AL88] = {BRW_SURFACEFORMAT_R8G8_UNORM,
                             BRW_SURFACEFORMAT_L8A8_UNORM,
                             blorp_shadow_shader},
-      [MESA_FORMAT_AL88_REV] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_AL88_REV] = {BRW_SURFACEFORMAT_NONE,
                                 BRW_SURFACEFORMAT_R8G8_UNORM,
                                 sample_swizzle_xy},
-      [MESA_FORMAT_AL1616] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_AL1616] = {BRW_SURFACEFORMAT_R16G16_UNORM,
                               BRW_SURFACEFORMAT_L16A16_UNORM,
-                              0},
-      [MESA_FORMAT_AL1616_REV] = {BRW_SURFACE_FORMAT_NONE,
+                              blorp_shadow_shader},
+      [MESA_FORMAT_AL1616_REV] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_R16G16_UNORM,
                                   sample_swizzle_xy},
-      [MESA_FORMAT_RGB332] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB332] = {BRW_SURFACEFORMAT_NONE,
                               BRW_SURFACEFORMAT_R8_UNORM,
                               scale_x},
       [MESA_FORMAT_A8] = {BRW_SURFACEFORMAT_A8_UNORM,
@@ -451,7 +451,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_GR88] = {BRW_SURFACEFORMAT_R8G8_UNORM,
                             BRW_SURFACEFORMAT_R8G8_UNORM,
                             0},
-      [MESA_FORMAT_RG88] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RG88] = {BRW_SURFACEFORMAT_NONE,
                             BRW_SURFACEFORMAT_R8G8_UNORM,
                             sample_swizzle_xy},
       [MESA_FORMAT_R16] = {BRW_SURFACEFORMAT_R16_UNORM,
@@ -460,13 +460,13 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_GR1616] = {BRW_SURFACEFORMAT_R16G16_UNORM,
                               BRW_SURFACEFORMAT_R16G16_UNORM,
                               0},
-      [MESA_FORMAT_RG1616] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RG1616] = {BRW_SURFACEFORMAT_NONE,
                               BRW_SURFACEFORMAT_R16G16_UNORM,
                               sample_swizzle_xy},
       [MESA_FORMAT_ARGB2101010] = {BRW_SURFACEFORMAT_B10G10R10A2_UNORM,
                                    BRW_SURFACEFORMAT_B10G10R10A2_UNORM,
                                    0},
-      [MESA_FORMAT_Z24_S8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_Z24_S8] = {BRW_SURFACEFORMAT_NONE,
                               BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                               sample_swizzle_all},
       [MESA_FORMAT_S8_Z24] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
@@ -474,64 +474,64 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
                               0},
       [MESA_FORMAT_Z16] = {BRW_SURFACEFORMAT_R16_UNORM,
                            BRW_SURFACEFORMAT_I16_UNORM,
-                           blorp_shadow_shader},
+                           0},
       [MESA_FORMAT_X8_Z24] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                               BRW_SURFACEFORMAT_I24X8_UNORM,
                               0},
-      [MESA_FORMAT_Z24_X8] = {BRW_SURFACE_FORMAT_NONE,
-                              BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_Z24_X8] = {BRW_SURFACEFORMAT_NONE,
+                              BRW_SURFACEFORMAT_NONE,
                               sample_swizzle_all},
-      [MESA_FORMAT_Z32] = {BRW_SURFACE_FORMAT_NONE,
-                           BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_Z32] = {BRW_SURFACEFORMAT_NONE,
+                           BRW_SURFACEFORMAT_NONE,
                            sample_swizzle_all},
       [MESA_FORMAT_S8] = {BRW_SURFACEFORMAT_R8_UNORM,
                           BRW_SURFACEFORMAT_R8_UNORM,
-                          blorp_shadow_shader},
+                          0},
 
-      [MESA_FORMAT_SRGB8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SRGB8] = {BRW_SURFACEFORMAT_NONE,
                              BRW_SURFACEFORMAT_B8G8R8X8_UNORM_SRGB,
                              sample_swizzle_xyz},
-      [MESA_FORMAT_SRGBA8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SRGBA8] = {BRW_SURFACEFORMAT_NONE,
                               BRW_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB,
                               sample_swizzle_all},
       [MESA_FORMAT_SARGB8] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB,
                               BRW_SURFACEFORMAT_B8G8R8A8_UNORM_SRGB,
                               0},
-      [MESA_FORMAT_SL8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SL8] = {BRW_SURFACEFORMAT_NONE,
                            BRW_SURFACEFORMAT_L8_UNORM_SRGB,
                            0},
-      [MESA_FORMAT_SLA8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SLA8] = {BRW_SURFACEFORMAT_NONE,
                             BRW_SURFACEFORMAT_L8A8_UNORM_SRGB,
                             0},
-      [MESA_FORMAT_SRGB_DXT1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SRGB_DXT1] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_DXT1_RGB_SRGB,
                                  0},
-      [MESA_FORMAT_SRGBA_DXT1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SRGBA_DXT1] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_BC1_UNORM_SRGB,
                                   0},
-      [MESA_FORMAT_SRGBA_DXT3] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SRGBA_DXT3] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_BC2_UNORM_SRGB,
                                   0},
-      [MESA_FORMAT_SRGBA_DXT5] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SRGBA_DXT5] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_BC3_UNORM_SRGB,
                                   0},
 
-      [MESA_FORMAT_RGB_FXT1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB_FXT1] = {BRW_SURFACEFORMAT_NONE,
                                 BRW_SURFACEFORMAT_FXT1,
                                 0},
-      [MESA_FORMAT_RGBA_FXT1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGBA_FXT1] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_FXT1,
                                  0},
-      [MESA_FORMAT_RGB_DXT1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB_DXT1] = {BRW_SURFACEFORMAT_NONE,
                                 BRW_SURFACEFORMAT_DXT1_RGB,
                                 0},
-      [MESA_FORMAT_RGBA_DXT1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGBA_DXT1] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_BC1_UNORM,
                                  0},
-      [MESA_FORMAT_RGBA_DXT3] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGBA_DXT3] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_BC2_UNORM,
                                  0},
-      [MESA_FORMAT_RGBA_DXT5] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGBA_DXT5] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_BC3_UNORM,
                                  0},
 
@@ -541,30 +541,30 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_RGBA_FLOAT16] = {BRW_SURFACEFORMAT_R16G16B16A16_FLOAT,
                                     BRW_SURFACEFORMAT_R16G16B16A16_FLOAT,
                                     0},
-      [MESA_FORMAT_RGB_FLOAT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB_FLOAT32] = {BRW_SURFACEFORMAT_NONE,
                                    BRW_SURFACEFORMAT_R32G32B32_FLOAT,
                                    0},
-      [MESA_FORMAT_RGB_FLOAT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB_FLOAT16] = {BRW_SURFACEFORMAT_NONE,
                                    BRW_SURFACEFORMAT_R16G16B16_FLOAT,
                                    0},
       [MESA_FORMAT_ALPHA_FLOAT32] = {BRW_SURFACEFORMAT_R32_FLOAT,
                                      BRW_SURFACEFORMAT_A32_FLOAT,
                                      blorp_shadow_shader},
-      [MESA_FORMAT_ALPHA_FLOAT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ALPHA_FLOAT16] = {BRW_SURFACEFORMAT_NONE,
                                      BRW_SURFACEFORMAT_A16_FLOAT,
                                      0},
-      [MESA_FORMAT_LUMINANCE_FLOAT32] = {BRW_SURFACEFORMAT_L32_FLOAT,
-                                         BRW_SURFACEFORMAT_R32_FLOAT,
+      [MESA_FORMAT_LUMINANCE_FLOAT32] = {BRW_SURFACEFORMAT_R32_FLOAT,
+                                         BRW_SURFACEFORMAT_L32_FLOAT,
                                          blorp_shadow_shader},
       [MESA_FORMAT_LUMINANCE_FLOAT16] = {BRW_SURFACEFORMAT_R16_FLOAT,
                                          BRW_SURFACEFORMAT_L16_FLOAT,
                                          blorp_shadow_shader},
-      [MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = {BRW_SURFACEFORMAT_R32G32_FLOAT,
                                                BRW_SURFACEFORMAT_L32A32_FLOAT,
-                                               0},
-      [MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = {BRW_SURFACE_FORMAT_NONE,
+                                               blorp_shadow_shader},
+      [MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16] = {BRW_SURFACEFORMAT_R16G16_FLOAT,
                                                BRW_SURFACEFORMAT_L16A16_FLOAT,
-                                               0},
+                                               blorp_shadow_shader},
       [MESA_FORMAT_INTENSITY_FLOAT32] = {BRW_SURFACEFORMAT_R32_FLOAT,
                                          BRW_SURFACEFORMAT_I32_FLOAT,
                                          blorp_shadow_shader},
@@ -584,80 +584,80 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
                                   BRW_SURFACEFORMAT_R16G16_FLOAT,
                                   0},
 
-      [MESA_FORMAT_ALPHA_UINT8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ALPHA_UINT8] = {BRW_SURFACEFORMAT_NONE,
                                    BRW_SURFACEFORMAT_R8_UINT,
                                    0},
-      [MESA_FORMAT_ALPHA_UINT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ALPHA_UINT16] = {BRW_SURFACEFORMAT_NONE,
                                     BRW_SURFACEFORMAT_R16_UINT,
                                     0},
-      [MESA_FORMAT_ALPHA_UINT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ALPHA_UINT32] = {BRW_SURFACEFORMAT_NONE,
                                     BRW_SURFACEFORMAT_R32_UINT,
                                     0},
-      [MESA_FORMAT_ALPHA_INT8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ALPHA_INT8] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_R8_SINT,
                                   0},
-      [MESA_FORMAT_ALPHA_INT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ALPHA_INT16] = {BRW_SURFACEFORMAT_NONE,
                                    BRW_SURFACEFORMAT_R16_SINT,
                                    0},
-      [MESA_FORMAT_ALPHA_INT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ALPHA_INT32] = {BRW_SURFACEFORMAT_NONE,
                                    BRW_SURFACEFORMAT_R32_SINT,
                                    0},
 
-      [MESA_FORMAT_INTENSITY_UINT8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_INTENSITY_UINT8] = {BRW_SURFACEFORMAT_NONE,
                                        BRW_SURFACEFORMAT_R8_UINT,
                                        0},
-      [MESA_FORMAT_INTENSITY_UINT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_INTENSITY_UINT16] = {BRW_SURFACEFORMAT_NONE,
                                         BRW_SURFACEFORMAT_R16_UINT,
                                         0},
-      [MESA_FORMAT_INTENSITY_UINT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_INTENSITY_UINT32] = {BRW_SURFACEFORMAT_NONE,
                                         BRW_SURFACEFORMAT_R32_UINT,
                                         0},
-      [MESA_FORMAT_INTENSITY_INT8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_INTENSITY_INT8] = {BRW_SURFACEFORMAT_NONE,
                                       BRW_SURFACEFORMAT_R8_SINT,
                                       0},
-      [MESA_FORMAT_INTENSITY_INT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_INTENSITY_INT16] = {BRW_SURFACEFORMAT_NONE,
                                        BRW_SURFACEFORMAT_R16_SINT,
                                        0},
-      [MESA_FORMAT_INTENSITY_INT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_INTENSITY_INT32] = {BRW_SURFACEFORMAT_NONE,
                                        BRW_SURFACEFORMAT_R32_SINT,
                                        0},
 
-      [MESA_FORMAT_LUMINANCE_UINT8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LUMINANCE_UINT8] = {BRW_SURFACEFORMAT_NONE,
                                        BRW_SURFACEFORMAT_R8_UINT,
                                        0},
-      [MESA_FORMAT_LUMINANCE_UINT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LUMINANCE_UINT16] = {BRW_SURFACEFORMAT_NONE,
                                         BRW_SURFACEFORMAT_R16_UINT,
                                         0},
-      [MESA_FORMAT_LUMINANCE_UINT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LUMINANCE_UINT32] = {BRW_SURFACEFORMAT_NONE,
                                         BRW_SURFACEFORMAT_R32_UINT,
                                         0},
-      [MESA_FORMAT_LUMINANCE_INT8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LUMINANCE_INT8] = {BRW_SURFACEFORMAT_NONE,
                                       BRW_SURFACEFORMAT_R8_SINT,
                                       0},
-      [MESA_FORMAT_LUMINANCE_INT16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LUMINANCE_INT16] = {BRW_SURFACEFORMAT_NONE,
                                        BRW_SURFACEFORMAT_R16_SINT,
                                        0},
-      [MESA_FORMAT_LUMINANCE_INT32] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LUMINANCE_INT32] = {BRW_SURFACEFORMAT_NONE,
                                        BRW_SURFACEFORMAT_R32_SINT,
                                        0},
 
-      [MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = {BRW_SURFACE_FORMAT_NONE,
-                                             BRW_SURFACEFORMAT_R8_UINT,
+      [MESA_FORMAT_LUMINANCE_ALPHA_UINT8] = {BRW_SURFACEFORMAT_NONE,
+                                             BRW_SURFACEFORMAT_R8G8_UINT,
                                              sample_swizzle_x},
-      [MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = {BRW_SURFACE_FORMAT_NONE,
-                                              BRW_SURFACEFORMAT_R16_UINT,
+      [MESA_FORMAT_LUMINANCE_ALPHA_UINT16] = {BRW_SURFACEFORMAT_NONE,
+                                              BRW_SURFACEFORMAT_R16G16_UINT,
                                               sample_swizzle_x},
-      [MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = {BRW_SURFACE_FORMAT_NONE,
-                                              BRW_SURFACEFORMAT_R32_UINT,
+      [MESA_FORMAT_LUMINANCE_ALPHA_UINT32] = {BRW_SURFACEFORMAT_NONE,
+                                              BRW_SURFACEFORMAT_R32G32_UINT,
                                               sample_swizzle_x},
-      [MESA_FORMAT_LUMINANCE_ALPHA_INT8] = {BRW_SURFACE_FORMAT_NONE,
-                                            BRW_SURFACEFORMAT_R8_SINT,
+      [MESA_FORMAT_LUMINANCE_ALPHA_INT8] = {BRW_SURFACEFORMAT_NONE,
+                                            BRW_SURFACEFORMAT_R8G8_SINT,
                                             sample_swizzle_x},
-      [MESA_FORMAT_LUMINANCE_ALPHA_INT16] = {BRW_SURFACE_FORMAT_NONE,
-                                             BRW_SURFACEFORMAT_R16_SINT,
+      [MESA_FORMAT_LUMINANCE_ALPHA_INT16] = {BRW_SURFACEFORMAT_NONE,
+                                             BRW_SURFACEFORMAT_R16G16_SINT,
                                              sample_swizzle_x},
-      [MESA_FORMAT_LUMINANCE_ALPHA_INT32] = {BRW_SURFACE_FORMAT_NONE,
-                                             BRW_SURFACEFORMAT_R32_SINT,
+      [MESA_FORMAT_LUMINANCE_ALPHA_INT32] = {BRW_SURFACEFORMAT_NONE,
+                                             BRW_SURFACEFORMAT_R32G32_SINT,
                                              sample_swizzle_x},
 
       [MESA_FORMAT_R_INT8] = {BRW_SURFACEFORMAT_R8_SINT,
@@ -666,7 +666,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_RG_INT8] = {BRW_SURFACEFORMAT_R8G8_SINT,
                                BRW_SURFACEFORMAT_R8G8_SINT,
                                0},
-      [MESA_FORMAT_RGB_INT8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB_INT8] = {BRW_SURFACEFORMAT_NONE,
                                 BRW_SURFACEFORMAT_R8_SINT,
                                 sample_scale},
       [MESA_FORMAT_RGBA_INT8] = {BRW_SURFACEFORMAT_R8G8B8A8_SINT,
@@ -678,7 +678,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_RG_INT16] = {BRW_SURFACEFORMAT_R16G16_SINT,
                                 BRW_SURFACEFORMAT_R16G16_SINT,
                                 0},
-      [MESA_FORMAT_RGB_INT16] = {BRW_SURFACE_FORMAT_NONE, /* This format requires converting SINT to another format in blorp. */
+      [MESA_FORMAT_RGB_INT16] = {BRW_SURFACEFORMAT_NONE, /* This format requires converting SINT to another format in blorp. */
                                  BRW_SURFACEFORMAT_R16G16B16_SINT,
                                  0},
       [MESA_FORMAT_RGBA_INT16] = {BRW_SURFACEFORMAT_R16G16B16A16_SINT,
@@ -715,7 +715,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_RG_UINT16] = {BRW_SURFACEFORMAT_R16G16_UINT,
                                  BRW_SURFACEFORMAT_R16G16_UINT,
                                  0},
-      [MESA_FORMAT_RGB_UINT16] = {BRW_SURFACE_FORMAT_NONE, /* This format requires converting UINT to another format in blorp. */
+      [MESA_FORMAT_RGB_UINT16] = {BRW_SURFACEFORMAT_NONE, /* This format requires converting UINT to another format in blorp. */
                                   BRW_SURFACEFORMAT_R16G16B16_UINT,
                                   0},
       [MESA_FORMAT_RGBA_UINT16] = {BRW_SURFACEFORMAT_R16G16B16A16_UINT,
@@ -734,8 +734,8 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
                                    BRW_SURFACEFORMAT_R32G32B32A32_UINT,
                                    0},
 
-      [MESA_FORMAT_DUDV8] = {BRW_SURFACEFORMAT_R8G8_SNORM,
-                             BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_DUDV8] = {BRW_SURFACEFORMAT_NONE,
+                             BRW_SURFACEFORMAT_R8G8_SNORM,
                              0},
       [MESA_FORMAT_SIGNED_R8] = {BRW_SURFACEFORMAT_R8_SNORM,
                                  BRW_SURFACEFORMAT_R8_SNORM,
@@ -758,7 +758,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
       [MESA_FORMAT_SIGNED_GR1616] = {BRW_SURFACEFORMAT_R16G16_SNORM,
                                      BRW_SURFACEFORMAT_R16G16_SNORM,
                                      0},
-      [MESA_FORMAT_SIGNED_RGB_16] = {BRW_SURFACE_FORMAT_NONE, /* This format requires converting SNORM to another format in blorp. */
+      [MESA_FORMAT_SIGNED_RGB_16] = {BRW_SURFACEFORMAT_NONE, /* This format requires converting SNORM to another format in blorp. */
                                      BRW_SURFACEFORMAT_R16G16B16_SNORM,
                                      0},
       [MESA_FORMAT_SIGNED_RGBA_16] = {BRW_SURFACEFORMAT_R16G16B16A16_SNORM,
@@ -768,95 +768,95 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
                                BRW_SURFACEFORMAT_R16G16B16A16_UNORM,
                                0},
 
-      [MESA_FORMAT_RED_RGTC1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RED_RGTC1] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_BC4_UNORM,
                                  0},
-      [MESA_FORMAT_SIGNED_RED_RGTC1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_RED_RGTC1] = {BRW_SURFACEFORMAT_NONE,
                                         BRW_SURFACEFORMAT_BC4_SNORM,
                                         0},
-      [MESA_FORMAT_RG_RGTC2] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RG_RGTC2] = {BRW_SURFACEFORMAT_NONE,
                                 BRW_SURFACEFORMAT_BC5_UNORM,
                                 0},
-      [MESA_FORMAT_SIGNED_RG_RGTC2] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_RG_RGTC2] = {BRW_SURFACEFORMAT_NONE,
                                        BRW_SURFACEFORMAT_BC5_SNORM,
                                        0},
 
-      [MESA_FORMAT_L_LATC1] = {BRW_SURFACE_FORMAT_NONE,
-                               BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_L_LATC1] = {BRW_SURFACEFORMAT_NONE,
+                               BRW_SURFACEFORMAT_NONE,
                                sample_swizzle_all},
-      [MESA_FORMAT_SIGNED_L_LATC1] = {BRW_SURFACE_FORMAT_NONE,
-                                      BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_L_LATC1] = {BRW_SURFACEFORMAT_NONE,
+                                      BRW_SURFACEFORMAT_NONE,
                                       sample_swizzle_all},
-      [MESA_FORMAT_LA_LATC2] = {BRW_SURFACE_FORMAT_NONE,
-                                BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_LA_LATC2] = {BRW_SURFACEFORMAT_NONE,
+                                BRW_SURFACEFORMAT_NONE,
                                 sample_swizzle_all},
-      [MESA_FORMAT_SIGNED_LA_LATC2] = {BRW_SURFACE_FORMAT_NONE,
-                                       BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_LA_LATC2] = {BRW_SURFACEFORMAT_NONE,
+                                       BRW_SURFACEFORMAT_NONE,
                                        sample_swizzle_all},
 
-      [MESA_FORMAT_ETC1_RGB8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC1_RGB8] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_ETC1_RGB8,
                                  0},
-      [MESA_FORMAT_ETC2_RGB8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_RGB8] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_ETC2_RGB8,
                                  0},
-      [MESA_FORMAT_ETC2_SRGB8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_SRGB8] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_ETC2_SRGB8,
                                   0},
-      [MESA_FORMAT_ETC2_RGBA8_EAC] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_RGBA8_EAC] = {BRW_SURFACEFORMAT_NONE,
                                       BRW_SURFACEFORMAT_ETC2_EAC_RGBA8,
                                       0},
-      [MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC] = {BRW_SURFACEFORMAT_NONE,
                                              BRW_SURFACEFORMAT_ETC2_EAC_SRGB8_A8,
                                              0},
-      [MESA_FORMAT_ETC2_R11_EAC] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_R11_EAC] = {BRW_SURFACEFORMAT_NONE,
                                     BRW_SURFACEFORMAT_EAC_R11,
                                     0},
-      [MESA_FORMAT_ETC2_RG11_EAC] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_RG11_EAC] = {BRW_SURFACEFORMAT_NONE,
                                      BRW_SURFACEFORMAT_EAC_RG11,
                                      0},
-      [MESA_FORMAT_ETC2_SIGNED_R11_EAC] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_SIGNED_R11_EAC] = {BRW_SURFACEFORMAT_NONE,
                                            BRW_SURFACEFORMAT_EAC_SIGNED_R11,
                                            0},
-      [MESA_FORMAT_ETC2_SIGNED_RG11_EAC] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_SIGNED_RG11_EAC] = {BRW_SURFACEFORMAT_NONE,
                                             BRW_SURFACEFORMAT_EAC_SIGNED_RG11,
                                             0},
-      [MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1] = {BRW_SURFACEFORMAT_NONE,
                                                      BRW_SURFACEFORMAT_ETC2_RGB8_PTA,
                                                      0},
-      [MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1] = {BRW_SURFACEFORMAT_NONE,
                                                       BRW_SURFACEFORMAT_ETC2_SRGB8_PTA,
                                                       0},
 
-      [MESA_FORMAT_SIGNED_A8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_A8] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_R8_SNORM,
                                  sample_swizzle_x},
-      [MESA_FORMAT_SIGNED_L8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_L8] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_R8_SNORM,
                                  sample_swizzle_x},
-      [MESA_FORMAT_SIGNED_AL88] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_AL88] = {BRW_SURFACEFORMAT_NONE,
                                    BRW_SURFACEFORMAT_R8G8_SNORM,
                                    sample_swizzle_x},
-      [MESA_FORMAT_SIGNED_I8] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_I8] = {BRW_SURFACEFORMAT_NONE,
                                  BRW_SURFACEFORMAT_R8_SNORM,
                                  sample_swizzle_x},
-      [MESA_FORMAT_SIGNED_A16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_A16] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_R16_SNORM,
                                   sample_swizzle_x},
-      [MESA_FORMAT_SIGNED_L16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_L16] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_R16_SNORM,
                                   sample_swizzle_x},
-      [MESA_FORMAT_SIGNED_AL1616] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_AL1616] = {BRW_SURFACEFORMAT_NONE,
                                      BRW_SURFACEFORMAT_R16G16_SNORM,
                                      sample_swizzle_x},
-      [MESA_FORMAT_SIGNED_I16] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_SIGNED_I16] = {BRW_SURFACEFORMAT_NONE,
                                   BRW_SURFACEFORMAT_R16_SNORM,
                                   sample_swizzle_x},
 
-      [MESA_FORMAT_RGB9_E5_FLOAT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_RGB9_E5_FLOAT] = {BRW_SURFACEFORMAT_NONE,
                                      BRW_SURFACEFORMAT_R9G9B9E5_SHAREDEXP,
                                      0},
-      [MESA_FORMAT_R11_G11_B10_FLOAT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_R11_G11_B10_FLOAT] = {BRW_SURFACEFORMAT_NONE,
                                          BRW_SURFACEFORMAT_R11G11B10_FLOAT,
                                          0},
 
@@ -867,56 +867,56 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_
                                        BRW_SURFACEFORMAT_R32G32_FLOAT,
                                        0},
 
-      [MESA_FORMAT_ARGB2101010_UINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ARGB2101010_UINT] = {BRW_SURFACEFORMAT_NONE,
                                         BRW_SURFACEFORMAT_B10G10R10A2_UINT,
                                         0},
-      [MESA_FORMAT_ABGR2101010_UINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ABGR2101010_UINT] = {BRW_SURFACEFORMAT_NONE,
                                         BRW_SURFACEFORMAT_R10G10B10A2_UINT,
                                         0},
 
-      [MESA_FORMAT_XRGB4444_UNORM] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XRGB4444_UNORM] = {BRW_SURFACEFORMAT_NONE,
                                       BRW_SURFACEFORMAT_R8G8_UNORM,
                                       sample_swizzle_xy | scale_xy},
-      [MESA_FORMAT_XRGB1555_UNORM] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XRGB1555_UNORM] = {BRW_SURFACEFORMAT_NONE,
                                       BRW_SURFACEFORMAT_B5G5R5X1_UNORM,
                                       0},
-      [MESA_FORMAT_XBGR8888_SNORM] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR8888_SNORM] = {BRW_SURFACEFORMAT_NONE,
                                       BRW_SURFACEFORMAT_R8G8B8A8_SNORM,
                                       sample_swizzle_all},
-      [MESA_FORMAT_XBGR8888_SRGB] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR8888_SRGB] = {BRW_SURFACEFORMAT_NONE,
                                      BRW_SURFACEFORMAT_R8G8B8X8_UNORM_SRGB,
                                      sample_swizzle_all},
-      [MESA_FORMAT_XBGR8888_UINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR8888_UINT] = {BRW_SURFACEFORMAT_NONE,
                                      BRW_SURFACEFORMAT_R8G8B8A8_UINT,
                                      sample_swizzle_all},
-      [MESA_FORMAT_XBGR8888_SINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR8888_SINT] = {BRW_SURFACEFORMAT_NONE,
                                      BRW_SURFACEFORMAT_R8G8B8A8_SINT,
                                      sample_swizzle_all},
-      [MESA_FORMAT_XRGB2101010_UNORM] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XRGB2101010_UNORM] = {BRW_SURFACEFORMAT_NONE,
                                          BRW_SURFACEFORMAT_B10G10R10X2_UNORM,
                                          0},
-      [MESA_FORMAT_XBGR16161616_UNORM] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR16161616_UNORM] = {BRW_SURFACEFORMAT_NONE,
                                           BRW_SURFACEFORMAT_R16G16B16X16_UNORM,
                                           0},
-      [MESA_FORMAT_XBGR16161616_SNORM] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR16161616_SNORM] = {BRW_SURFACEFORMAT_NONE,
                                           BRW_SURFACEFORMAT_R16G16B16A16_SNORM,
                                           sample_swizzle_all},
-      [MESA_FORMAT_XBGR16161616_FLOAT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR16161616_FLOAT] = {BRW_SURFACEFORMAT_NONE,
                                           BRW_SURFACEFORMAT_R16G16B16X16_FLOAT,
                                           0},
-      [MESA_FORMAT_XBGR16161616_UINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR16161616_UINT] = {BRW_SURFACEFORMAT_NONE,
                                          BRW_SURFACEFORMAT_R16G16B16A16_UINT,
                                          sample_swizzle_all},
-      [MESA_FORMAT_XBGR16161616_SINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR16161616_SINT] = {BRW_SURFACEFORMAT_NONE,
                                          BRW_SURFACEFORMAT_R16G16B16A16_SINT,
                                          sample_swizzle_all},
-      [MESA_FORMAT_XBGR32323232_FLOAT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR32323232_FLOAT] = {BRW_SURFACEFORMAT_NONE,
                                           BRW_SURFACEFORMAT_R32G32B32X32_FLOAT,
                                           0},
-      [MESA_FORMAT_XBGR32323232_UINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR32323232_UINT] = {BRW_SURFACEFORMAT_NONE,
                                          BRW_SURFACEFORMAT_R32G32B32A32_UINT,
                                          sample_swizzle_all},
-      [MESA_FORMAT_XBGR32323232_SINT] = {BRW_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_XBGR32323232_SINT] = {BRW_SURFACEFORMAT_NONE,
                                          BRW_SURFACEFORMAT_R32G32B32A32_SINT,
                                          sample_swizzle_all}