wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 2ef62f90853d9903cdded2442e382b89a4c3a55f.

Browse Source
This commit is contained in:
Zebediah Figura 2018-11-16 19:15:02 -06:00
parent 3e1acbd286
commit b8e292a69c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "ad576b6965fe9ce695bbf91ac229b04459af02d3"
echo "2ef62f90853d9903cdded2442e382b89a4c3a55f"
}
# Show version information

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

@ -1,4 +1,4 @@
From 4b7be2feda4db75f80580e64d9220e461e641d36 Mon Sep 17 00:00:00 2001
From db68f510b12411a5efc5b27c7bd6156e95760bae 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,7 +9,7 @@ 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 87998d55..f4ff0027 100644
index 05f210f6..e7c47260 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2394,11 +2394,13 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int
@ -25,7 +25,7 @@ index 87998d55..f4ff0027 100644
+ sub_resource = &texture->sub_resources[sub_resource_idx];
level = sub_resource_idx % texture->level_count;
if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
if ((texture->resource.type == WINED3D_RTYPE_TEXTURE_2D
@@ -2432,6 +2434,23 @@ void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int
GL_EXTCALL(glGetCompressedTexImage(target, level, data->addr));
checkGLcall("glGetCompressedTexImage");