Rebase against ab78cffea7ac676a7041c7d6941b61140cfe005c.

This commit is contained in:
Sebastian Lackner
2016-04-19 18:47:15 +02:00
parent c366169c65
commit cc990d9a9b
3 changed files with 10 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
From bf05198e84d5e154902542508e769163fcda3cc8 Mon Sep 17 00:00:00 2001
From b8c44cd1d2f029251cf05c9620b4cdc52b1e43fd 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,11 +9,11 @@ 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 3476b32e..ec2f372 100644
index c8a7695..33b2204 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1036,7 +1036,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
}
@@ -1230,7 +1230,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
sub_resource_idx = layer * texture->level_count;
if (dirty_region)
- FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region));