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 040b2a9c75666527af6ca79d9146095c8ed6a3cf.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2024-05-13 09:28:53 +10:00
parent b0595d928b
commit e4078c26a2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/wined3d-rotate-WINED3D_SWAP_EFFECT_DISCARD/0001-wined3d-Do-not-rotate-WINED3D_SWAP_EFFECT_DISCARD-sw.patch
View File

@ -1,4 +1,4 @@
From 1f455f575b3a17cbf4bae3d44d8fa08ec3d21c4c Mon Sep 17 00:00:00 2001
From 7df284bcf76788b078b4c43ce2de0c338b557e8a Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu, 13 May 2021 17:58:12 +0200
Subject: [PATCH] wined3d: Do not rotate WINED3D_SWAP_EFFECT_DISCARD
@ -14,22 +14,22 @@ behave in a similar way.
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 49a40f3e1d6..d0f73fc690e 100644
index 6b2ad8d6954..c0721067bd1 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -531,8 +531,9 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str
@@ -523,8 +523,9 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str
unsigned int i;
static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE;
- if (swapchain->state.desc.backbuffer_count < 2 || wined3d_settings.offscreen_rendering_mode != ORM_FBO)
- if (swapchain->state.desc.backbuffer_count < 2)
- return;
+ if (swapchain->state.desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD
+ || swapchain->state.desc.backbuffer_count < 2 || wined3d_settings.offscreen_rendering_mode != ORM_FBO)
+ || swapchain->state.desc.backbuffer_count < 2)
+ return;
texture_prev = wined3d_texture_gl(swapchain->back_buffers[0]);
@@ -1181,7 +1182,8 @@ static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, str
@@ -1177,7 +1178,8 @@ static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, str
static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE;
@ -40,5 +40,5 @@ index 49a40f3e1d6..d0f73fc690e 100644
texture_prev = wined3d_texture_vk(swapchain->back_buffers[0]);
--
2.34.1
2.43.0

2
staging/upstream-commit
View File

@ -1 +1 @@
655de4b0bf09746cd163dc771abd2c0f3c777447
040b2a9c75666527af6ca79d9146095c8ed6a3cf