Rebase against 28c35689d2d9193cbf7ce5f523fecbaf377ae273.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c"
+	echo "28c35689d2d9193cbf7ce5f523fecbaf377ae273"
 }
 
 # Show version information

patches/wined3d-mesa_texture_download/0001-wined3d-Use-glReadPixels-for-RT-texture-download.patch

@@ -1,4 +1,4 @@
-From 4b886ea84a59520ca70cff929e396577fda52c74 Mon Sep 17 00:00:00 2001
+From eca848444ad8ab987b93ba54752c122d8eb69237 Mon Sep 17 00:00:00 2001
 From: Andrew Wesie <awesie@gmail.com>
 Date: Sun, 30 Sep 2018 12:02:00 -0500
 Subject: [PATCH] wined3d: Use glReadPixels for RT texture download.
@@ -9,10 +9,10 @@ Signed-off-by: Andrew Wesie <awesie@gmail.com>
  1 file changed, 19 insertions(+)
 
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index 7e2da350f5a..1b3b9ca0b3a 100644
+index 1ab50a27596..2024f2aba23 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -2827,6 +2827,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
+@@ -2832,6 +2832,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
      struct wined3d_bo *dst_bo;
      BOOL srgb = FALSE;
      GLenum target;
@@ -20,7 +20,7 @@ index 7e2da350f5a..1b3b9ca0b3a 100644
  
      TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, "
              "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n",
-@@ -2881,6 +2882,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
+@@ -2886,6 +2887,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
  
      format_gl = wined3d_format_gl(src_texture->resource.format);
      target = wined3d_texture_gl_get_sub_resource_target(src_texture_gl, src_sub_resource_idx);
@@ -28,8 +28,8 @@ index 7e2da350f5a..1b3b9ca0b3a 100644
  
      if ((src_texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
              && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count
-@@ -2913,6 +2915,23 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
-         GL_EXTCALL(glGetCompressedTexImage(target, src_level, dst_bo_addr->addr));
+@@ -2919,6 +2921,23 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context,
+         GL_EXTCALL(glGetCompressedTexImage(target, src_level, offset));
          checkGLcall("glGetCompressedTexImage");
      }
 +    else if (dst_bo_addr->buffer_object && src_texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET)

staging/upstream-commit

@@ -1 +1 @@
-b5b77ed6acad6a20bd4c5bfc98cfce178eef1d0c
+28c35689d2d9193cbf7ce5f523fecbaf377ae273