wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove several d3d patchsets:

Browse Source 
* wined3d-Core_Context: fixed by 62651d65f4f8e4dc6e1f4fb5d589526613d419aa
* wined3d-Limit_Vram: This patch is a no-op; LONG_MAX is 0x7fffffffffffffff on 64-bit.
* wined3d-Revert_Surface_Blt: fixed by d38076fd57a50452b17d61f771688bbfcd3a5563
* wined3d-WINED3DFMT_R32G32_UINT: fixed by af1be967a0b0262a980e9bfbdff107c1d6db7e8d
* wined3d-sample_c_lz: fixed by ce8610cea58ed1ba9d8f17857e507d9d6c30132d
* wined3d-CSMT_Helper, wined3d-CSMT_Main: Remove CSMT_Helper and remove toggle for CSMT_Main. CSMT is in Wine and configurable.
	Also remove patches 0008, 0019, 0034, which are no-ops and not useful.
* makedep-PARENTSPEC: Remove patch which was only needed for wined3d-csmt.
This commit is contained in:
Zebediah Figura
2018-03-27 19:57:14 -05:00
parent b7119079a3
commit 5876a3f782
19 changed files with 46 additions and 1728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/wined3d-Viewports/0001-wined3d-Allow-arbitrary-viewports-for-d3d11.patch
View File

@@ -1,4 +1,4 @@
From 2ff2aaf55df96d6dade866d11f273630a2fcbf90 Mon Sep 17 00:00:00 2001
From 9e3fd02b6ba9494fd9433fef92cbf6cbcfb39ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 17 Aug 2017 19:29:30 +0200
Subject: wined3d: Allow arbitrary viewports for d3d11.
@@ -112,7 +112,7 @@ index cdce669..644766c 100644
if (!extended)
flags |= WINED3D_VIDMEM_ACCOUNTING;
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 3cf9b76..d744a5c 100644
index a9632de..fe3301e 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -65,7 +65,7 @@ struct FvfToDecl
@@ -125,10 +125,10 @@ index 3cf9b76..d744a5c 100644
enum ddraw_device_state
{
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 9753186..486d22a 100644
index f20507b..c234758 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4696,10 +4696,13 @@ static void get_viewport(struct wined3d_context *context, const struct wined3d_s
@@ -4559,10 +4559,13 @@ static void get_viewport(struct wined3d_context *context, const struct wined3d_s
if (target)
{
@@ -147,14 +147,14 @@ index 9753186..486d22a 100644
/*
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index f555d1d..2184a00 100644
index 5921646..d4abb29 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1312,6 +1312,7 @@ enum wined3d_shader_byte_code_format
@@ -1314,6 +1314,7 @@ enum wined3d_shader_byte_code_format
#define WINED3D_NO_PRIMITIVE_RESTART 0x00000800
#define WINED3D_LEGACY_CUBEMAP_FILTERING 0x00001000
#define WINED3D_NORMALIZED_DEPTH_BIAS 0x00002000
#define WINED3D_REQUEST_D3D10 0x00004000
+#define WINED3D_LIMIT_VIEWPORT 0x00008000
+#define WINED3D_LIMIT_VIEWPORT 0x00004000
#define WINED3D_RESZ_CODE 0x7fa05000

3
patches/wined3d-Viewports/definition
View File

@@ -1,2 +1,3 @@
Fixes: Allow arbitrary viewports for d3d11 in wined3d
Depends: wined3d-Core_Context
Depends: d3d11-Depth_Bias
# For Overwatch; see https://www.winehq.org/pipermail/wine-devel/2016-November/115312.html