wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 2a5b4fd884801a7f394ade49142fbfdba195243c.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-06-11 19:33:18 +02:00
parent e741b83080
commit c92ffa58c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "9cc95e5a1d930d72892949a3ddf8fa00d471af88"
echo "2a5b4fd884801a7f394ade49142fbfdba195243c"
}
# Show version information

4
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -6962,7 +6962,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4331,7 +4331,11 @@
@@ -4464,7 +4464,11 @@
float y_offset = context->render_offscreen
? (center_offset - (2.0f * y) - h) / h
: (center_offset - (2.0f * y) - h) / -h;
@ -6974,7 +6974,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE;
float z_scale = zenable ? 2.0f : 0.0f;
float z_offset = zenable ? -1.0f : 0.0f;
@@ -5128,7 +5132,11 @@
@@ -5261,7 +5265,11 @@
break;
}
}