You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 7aadb08212a5269ebefcb100cf567f7cf7aa0a7c.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From b8c44cd1d2f029251cf05c9620b4cdc52b1e43fd Mon Sep 17 00:00:00 2001
|
||||
From 0a7d13f672cea0839dade4d06a332c024bea9a24 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 21 Mar 2016 18:27:59 +0100
|
||||
Subject: wined3d: Silence extremely noisy FIXME in
|
||||
@@ -9,10 +9,10 @@ Subject: wined3d: Silence extremely noisy FIXME in
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
|
||||
index c8a7695..33b2204 100644
|
||||
index 1f0a97a..2d8df58 100644
|
||||
--- a/dlls/wined3d/texture.c
|
||||
+++ b/dlls/wined3d/texture.c
|
||||
@@ -1230,7 +1230,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
|
||||
@@ -1418,7 +1418,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
|
||||
sub_resource_idx = layer * texture->level_count;
|
||||
|
||||
if (dirty_region)
|
||||
@@ -20,7 +20,7 @@ index c8a7695..33b2204 100644
|
||||
+ WARN("Ignoring dirty_region %s.\n", debug_box(dirty_region));
|
||||
|
||||
context = context_acquire(texture->resource.device, NULL);
|
||||
if (!texture->texture_ops->texture_load_location(texture, sub_resource_idx,
|
||||
if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding))
|
||||
--
|
||||
2.7.1
|
||||
2.9.0
|
||||
|
||||
|
Reference in New Issue
Block a user