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

Rebase against 19d57982ecb4520453a1b77ace386c625312e265.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-09-12 03:12:34 +02:00
parent f85692946e
commit d7385d6c01
18 changed files with 107 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 3ad3617ce54aec7da8800ea0d8bb8cb18fbc4494 Mon Sep 17 00:00:00 2001
From cea7f4b70408dd2ceb7f571b3b2efac2b58a389f 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.
@@ -13,10 +13,10 @@ Subject: wined3d: Allow arbitrary viewports for d3d11.
6 files changed, 73 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index b3c7ef47aab..b1bc6620c7f 100644
index 06708b5f2b4..9795a2c68ba 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -21926,6 +21926,60 @@ static void test_fractional_viewports(void)
@@ -21113,6 +21113,60 @@ static void test_fractional_viewports(void)
release_test_context(&test_context);
}
@@ -77,12 +77,13 @@ index b3c7ef47aab..b1bc6620c7f 100644
static void test_early_depth_stencil(void)
{
ID3D11DepthStencilState *depth_stencil_state;
@@ -22148,5 +22202,6 @@ START_TEST(d3d11)
@@ -21486,6 +21540,7 @@ START_TEST(d3d11)
test_gather();
test_gather_c();
test_fractional_viewports();
+ test_negative_viewports();
test_early_depth_stencil();
test_conservative_depth_output();
}
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index 24bd8315983..491efea31e2 100644
@@ -111,10 +112,10 @@ index fe7163fa88a..c1389529588 100644
if (!extended)
flags |= WINED3D_VIDMEM_ACCOUNTING;
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index c693135e84b..912e8b6f531 100644
index 0ae45328709..214c1718694 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -63,7 +63,7 @@ struct FvfToDecl
@@ -62,7 +62,7 @@ struct FvfToDecl
#define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \
| WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \
| WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \
@@ -124,10 +125,10 @@ index c693135e84b..912e8b6f531 100644
enum ddraw_device_state
{
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index a5a1a4bf90c..4424da4e850 100644
index 8b1729de2a3..53be418a623 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4629,11 +4629,13 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
@@ -4642,11 +4642,13 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine
if (target)
{
@@ -146,7 +147,7 @@ index a5a1a4bf90c..4424da4e850 100644
wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height);
}
else if (depth_stencil)
@@ -4675,10 +4677,13 @@ static void viewport_miscpart_cc(struct wined3d_context *context,
@@ -4688,10 +4690,13 @@ static void viewport_miscpart_cc(struct wined3d_context *context,
if (target)
{
@@ -165,10 +166,10 @@ index a5a1a4bf90c..4424da4e850 100644
wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height);
}
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 4378ba20fcb..df587733b20 100644
index f468e307b36..4a6b9ff7f3d 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1325,6 +1325,7 @@ enum wined3d_shader_byte_code_format
@@ -1310,6 +1310,7 @@ enum wined3d_shader_byte_code_format
#define WINED3D_LEGACY_CUBEMAP_FILTERING 0x00001000
#define WINED3D_FORWARD_DEPTH_BIAS 0x00002000
#define WINED3D_REQUEST_D3D10 0x00004000