ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-03-29 16:45:35 +02:00 committed by Alexandre Julliard
parent 33d49ecd76
commit 97f4034e58
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/wined3d/surface.c
View File

@ -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);

2
dlls/wined3d/texture.c
View File

@ -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);

2
dlls/wined3d/volume.c
View File

@ -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)