Henri Verbeet : wined3d: Get rid of the d3d_surface and d3d_texture debug channels.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 97f4034e58e0bd12f1da6e1d9f840bd0e18ed7c7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=97f4034e58e0bd12f1da6e1d9f...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Mar 29 16:45:35 2016 +0200

wined3d: Get rid of the d3d_surface and d3d_texture debug channels.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/surface.c | 13 +++++--------
 dlls/wined3d/texture.c |  2 +-
 dlls/wined3d/volume.c  |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index cd8c863..4a59c5a 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -30,9 +30,8 @@
 #include "wine/port.h"
 #include "wined3d_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
-WINE_DECLARE_DEBUG_CHANNEL(d3d);
 
 #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */
 
@@ -3262,7 +3261,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co
         return WINED3D_OK;
     }
 
-    if (WARN_ON(d3d_surface))
+    if (WARN_ON(d3d))
     {
         DWORD required_access = resource_access_from_location(location);
         if ((texture->resource.access_flags & required_access) != required_access)
@@ -3400,7 +3399,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info,
             }
         case WINED3D_BLIT_OP_COLOR_BLIT:
         case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST:
-            if (TRACE_ON(d3d_surface) && TRACE_ON(d3d))
+            if (TRACE_ON(d3d))
             {
                 TRACE("Checking support for fixup:\n");
                 dump_color_fixup_desc(src_format->color_fixup);
@@ -4128,10 +4127,8 @@ do { \
     }
 
 error:
-    if (flags && FIXME_ON(d3d_surface))
-    {
-        FIXME("\tUnsupported flags: %#x.\n", flags);
-    }
+    if (flags)
+        FIXME("    Unsupported flags %#x.\n", flags);
 
 release:
     wined3d_resource_unmap(&dst_texture->resource, dst_sub_resource_idx);
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 4cf445a..ce6162f 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -24,7 +24,7 @@
 #include "wine/port.h"
 #include "wined3d_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index fe1b6ee..bfc0d0b 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -24,7 +24,7 @@
 #include "wine/port.h"
 #include "wined3d_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
+WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
 
 static BOOL volume_prepare_system_memory(struct wined3d_volume *volume)