Rebase against d6557e812984e010a989a3360039453eb978bd12.

This commit is contained in:
Sebastian Lackner
2017-04-13 11:06:17 +02:00
parent 4a75337774
commit 830a8b9975
10 changed files with 298 additions and 492 deletions

View File

@@ -1,4 +1,4 @@
From 418256c5f4821f87fdc353d9eb1dd5991bdf2a1c Mon Sep 17 00:00:00 2001
From c91507431e6dc246386277821a0ba4a3719d0a36 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,18 +9,18 @@ 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 3219305246..684e18b46f 100644
index 2419616731..6e0ff4be4d 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1651,7 +1651,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
@@ -1648,7 +1648,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
}
if (dirty_region)
- FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region));
+ WARN("Ignoring dirty_region %s.\n", debug_box(dirty_region));
context = context_acquire(texture->resource.device, NULL, 0);
sub_resource_idx = layer * texture->level_count;
wined3d_cs_emit_add_dirty_texture_region(texture->resource.device->cs, texture, layer);
--
2.11.0