Rebase against 5536df1ee1042c6cf20a7d96c43520003a547092

This commit is contained in:
Paul Gofman
2019-12-03 03:43:30 +03:00
parent 9be789b289
commit 2f95fb4782
7 changed files with 112 additions and 131 deletions

View File

@@ -1,7 +1,7 @@
From c91507431e6dc246386277821a0ba4a3719d0a36 Mon Sep 17 00:00:00 2001
From bf91daf7caca1f40a645308c3d9e6bb255aba120 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
Subject: [PATCH] wined3d: Silence extremely noisy FIXME in
wined3d_texture_add_dirty_region.
---
@@ -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 2419616731..6e0ff4be4d 100644
index 57416a67de..414b6ff12f 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1648,7 +1648,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
}
if (dirty_region)
@@ -1844,7 +1844,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
WARN("Invalid dirty_region %s specified.\n", debug_box(dirty_region));
return WINED3DERR_INVALIDCALL;
}
- FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region));
+ WARN("Ignoring dirty_region %s.\n", debug_box(dirty_region));
}
wined3d_cs_emit_add_dirty_texture_region(texture->resource.device->cs, texture, layer);
--
2.11.0
2.23.0