glean pixelFormats is passing again

5 files changed, 12 insertions, 21 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index 40f736a112..1cee5c3553 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -365,7 +365,6 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
                              GLint dstX0, GLint dstY0,
                              GLint width, GLint height)
 {
-   return false;
    /* BLORP is not supported before Gen6. */
    if (brw->gen < 6) {
        DBG("%s: Older Gen not supported.\n", __FUNCTION__);
@@ -2320,7 +2319,6 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
          case GL_RG:
          case GL_RGB:
          case GL_RGBA:
-         case GL_ALPHA:
             break;
          default:
             /*
@@ -2335,10 +2333,6 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
       case GL_LUMINANCE:
       case GL_LUMINANCE_ALPHA:
          switch (internalFormat) {
-         case GL_RED:
-         case GL_RG:
-         case GL_RGB:
-         case GL_RGBA:
          case GL_ALPHA:
          case GL_INTENSITY:
          case GL_LUMINANCE:
diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index ad1bda7e2d..65e70c7fc0 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -355,20 +355,20 @@ 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_SURFACE_FORMAT_NONE,
+      [MESA_FORMAT_ARGB8888_REV] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                                     BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
                                     swizzle_all},
-      [MESA_FORMAT_RGBX8888] = {BRW_SURFACE_FORMAT_NONE,
-                                BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
+      [MESA_FORMAT_RGBX8888] = {BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
+                                BRW_SURFACEFORMAT_R8G8B8X8_UNORM,
                                 alpha_blend_render | swizzle_all},
       [MESA_FORMAT_RGBX8888_REV] = {BRW_SURFACEFORMAT_R8G8B8X8_UNORM,
                                     BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
-                                    0 | alpha_blend_render},
-      [MESA_FORMAT_XRGB8888] = {BRW_SURFACEFORMAT_B8G8R8X8_UNORM,
-                                BRW_SURFACEFORMAT_B8G8R8A8_UNORM,
-                                0 | alpha_blend_render},
-      [MESA_FORMAT_XRGB8888_REV] = {BRW_SURFACE_FORMAT_NONE,
-                                    BRW_SURFACEFORMAT_B8G8R8A8_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,
+                                    BRW_SURFACEFORMAT_B8G8R8X8_UNORM,
                                     alpha_blend_render | swizzle_all},
       [MESA_FORMAT_RGB888] = {BRW_SURFACE_FORMAT_NONE,
                               BRW_SURFACEFORMAT_R8_UNORM,
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 89de307fc3..798b566a85 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -291,7 +291,7 @@ brw_update_texture_surface(struct gl_context *ctx,
    BRW_SURFACE *dst_format;
    BRW_SURFACE *src_format;
 
-   if (for_gather) {
+   if (!for_gather) {
       dst_format = 0;
       src_format = &brw_surface;
    } else {
@@ -301,7 +301,7 @@ brw_update_texture_surface(struct gl_context *ctx,
    translate_tex_format(brw,
                         mt->format,
                         sampler->sRGBDecode,
-                        &process_flags, dst_format, src_format);
+                        &process_flags, 0, &brw_surface);
 
    surf[0] = (translate_tex_target(tObj->Target) << BRW_SURFACE_TYPE_SHIFT |
               BRW_SURFACE_MIPMAPLAYOUT_BELOW << BRW_SURFACE_MIPLAYOUT_SHIFT |
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index 4cd294d15e..15d05cdb16 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -294,7 +294,7 @@ gen7_update_texture_surface(struct gl_context *ctx,
    BRW_SURFACE *dst_format;
    BRW_SURFACE *src_format;
 
-   if (for_gather) {
+   if (!for_gather) {
       dst_format = 0;
       src_format = &tex_format;
    } else {
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index bdce98a4d8..9c3f1e86e5 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3043,9 +3043,6 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
                                               internalFormat, format, type);
    }
 
-   _mesa_debug(ctx, "%s: Texture Format: %s\n",
-               __FUNCTION__, _mesa_get_format_name(texFormat));
-
    assert(texFormat != MESA_FORMAT_NONE);
 
    /* check that width, height, depth are legal for the mipmap level */