Skip to content

W
wine-cw
Commit 63f4b6f0 authored by Andrew Riedi's avatar Andrew Riedi Committed by Alexandre Julliard
Browse files
Options

ddraw: DPRINTF -> TRACE.

parent 6de3bbc5
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
dlls/ddraw/executebuffer.c
View file @ 63f4b6f0
...@@ -54,18 +54,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7); ...@@ -54,18 +54,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
*****************************************************************************/ *****************************************************************************/
static void _dump_executedata(const D3DEXECUTEDATA *lpData) { static void _dump_executedata(const D3DEXECUTEDATA *lpData) {
DPRINTF("dwSize : %d\n", lpData->dwSize); TRACE("dwSize : %d\n", lpData->dwSize);
DPRINTF("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount); TRACE("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount);
DPRINTF("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength); TRACE("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
DPRINTF("HVertex Offset : %d\n", lpData->dwHVertexOffset); TRACE("HVertex Offset : %d\n", lpData->dwHVertexOffset);
} }
static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
DPRINTF("dwSize : %d\n", lpDesc->dwSize); TRACE("dwSize : %d\n", lpDesc->dwSize);
DPRINTF("dwFlags : %x\n", lpDesc->dwFlags); TRACE("dwFlags : %x\n", lpDesc->dwFlags);
DPRINTF("dwCaps : %x\n", lpDesc->dwCaps); TRACE("dwCaps : %x\n", lpDesc->dwCaps);
DPRINTF("dwBufferSize : %d\n", lpDesc->dwBufferSize); TRACE("dwBufferSize : %d\n", lpDesc->dwBufferSize);
DPRINTF("lpData : %p\n", lpDesc->lpData); TRACE("lpData : %p\n", lpDesc->lpData);
} }
/***************************************************************************** /*****************************************************************************
......
dlls/ddraw/light.c
View file @ 63f4b6f0
...@@ -158,7 +158,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface, ...@@ -158,7 +158,7 @@ IDirect3DLightImpl_Initialize(IDirect3DLight *iface,
*****************************************************************************/ *****************************************************************************/
static void dump_light(const D3DLIGHT2 *light) static void dump_light(const D3DLIGHT2 *light)
{ {
DPRINTF(" - dwSize : %d\n", light->dwSize); TRACE(" - dwSize : %d\n", light->dwSize);
} }
static const float zero_value[] = { static const float zero_value[] = {
......
dlls/ddraw/material.c
View file @ 63f4b6f0
...@@ -47,7 +47,7 @@ WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); ...@@ -47,7 +47,7 @@ WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
static void dump_material(const D3DMATERIAL *mat) static void dump_material(const D3DMATERIAL *mat)
{ {
DPRINTF(" dwSize : %d\n", mat->dwSize); TRACE(" dwSize : %d\n", mat->dwSize);
} }
/***************************************************************************** /*****************************************************************************
......
dlls/ddraw/utils.c
View file @ 63f4b6f0
...@@ -610,23 +610,23 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat) ...@@ -610,23 +610,23 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat)
/***************************************************************************** /*****************************************************************************
* Various dumping functions. * Various dumping functions.
* *
* They write the contents of a specific function to a DPRINTF. * They write the contents of a specific function to a TRACE.
* *
*****************************************************************************/ *****************************************************************************/
static void static void
DDRAW_dump_DWORD(const void *in) DDRAW_dump_DWORD(const void *in)
{ {
DPRINTF("%d", *((const DWORD *) in)); TRACE("%d", *((const DWORD *) in));
} }
static void static void
DDRAW_dump_PTR(const void *in) DDRAW_dump_PTR(const void *in)
{ {
DPRINTF("%p", *((const void * const*) in)); TRACE("%p", *((const void * const*) in));
} }
static void static void
DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck) DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck)
{ {
DPRINTF(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); TRACE(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue);
} }
#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1) #define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1)
...@@ -641,10 +641,10 @@ DDRAW_dump_flags_(DWORD flags, ...@@ -641,10 +641,10 @@ DDRAW_dump_flags_(DWORD flags,
for (i=0; i < num_names; i++) for (i=0; i < num_names; i++)
if ((flags & names[i].val) || /* standard flag value */ if ((flags & names[i].val) || /* standard flag value */
((!flags) && (!names[i].val))) /* zero value only */ ((!flags) && (!names[i].val))) /* zero value only */
DPRINTF("%s ", names[i].name); TRACE("%s ", names[i].name);
if (newline) if (newline)
DPRINTF("\n"); TRACE("\n");
} }
void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in)
...@@ -756,9 +756,9 @@ DDRAW_dump_members(DWORD flags, ...@@ -756,9 +756,9 @@ DDRAW_dump_members(DWORD flags,
{ {
if (mems[i].val & flags) if (mems[i].val & flags)
{ {
DPRINTF(" - %s : ", mems[i].name); TRACE(" - %s : ", mems[i].name);
mems[i].func((const char *)data + mems[i].offset); mems[i].func((const char *)data + mems[i].offset);
DPRINTF("\n"); TRACE("\n");
} }
} }
} }
...@@ -766,11 +766,11 @@ DDRAW_dump_members(DWORD flags, ...@@ -766,11 +766,11 @@ DDRAW_dump_members(DWORD flags,
void void
DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
{ {
DPRINTF("( "); TRACE("( ");
DDRAW_dump_pixelformat_flag(pf->dwFlags); DDRAW_dump_pixelformat_flag(pf->dwFlags);
if (pf->dwFlags & DDPF_FOURCC) if (pf->dwFlags & DDPF_FOURCC)
{ {
DPRINTF(", dwFourCC code '%c%c%c%c' (0x%08x) - %d bits per pixel", TRACE(", dwFourCC code '%c%c%c%c' (0x%08x) - %d bits per pixel",
(unsigned char)( pf->dwFourCC &0xff), (unsigned char)( pf->dwFourCC &0xff),
(unsigned char)((pf->dwFourCC>> 8)&0xff), (unsigned char)((pf->dwFourCC>> 8)&0xff),
(unsigned char)((pf->dwFourCC>>16)&0xff), (unsigned char)((pf->dwFourCC>>16)&0xff),
...@@ -782,7 +782,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) ...@@ -782,7 +782,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
if (pf->dwFlags & DDPF_RGB) if (pf->dwFlags & DDPF_RGB)
{ {
const char *cmd; const char *cmd;
DPRINTF(", RGB bits: %d, ", pf->u1.dwRGBBitCount); TRACE(", RGB bits: %d, ", pf->u1.dwRGBBitCount);
switch (pf->u1.dwRGBBitCount) switch (pf->u1.dwRGBBitCount)
{ {
case 4: cmd = "%1lx"; break; case 4: cmd = "%1lx"; break;
...@@ -792,35 +792,35 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) ...@@ -792,35 +792,35 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
case 32: cmd = "%08lx"; break; case 32: cmd = "%08lx"; break;
default: ERR("Unexpected bit depth !\n"); cmd = "%d"; break; default: ERR("Unexpected bit depth !\n"); cmd = "%d"; break;
} }
DPRINTF(" R "); DPRINTF(cmd, pf->u2.dwRBitMask); TRACE(" R "); TRACE(cmd, pf->u2.dwRBitMask);
DPRINTF(" G "); DPRINTF(cmd, pf->u3.dwGBitMask); TRACE(" G "); TRACE(cmd, pf->u3.dwGBitMask);
DPRINTF(" B "); DPRINTF(cmd, pf->u4.dwBBitMask); TRACE(" B "); TRACE(cmd, pf->u4.dwBBitMask);
if (pf->dwFlags & DDPF_ALPHAPIXELS) if (pf->dwFlags & DDPF_ALPHAPIXELS)
{ {
DPRINTF(" A "); DPRINTF(cmd, pf->u5.dwRGBAlphaBitMask); TRACE(" A "); TRACE(cmd, pf->u5.dwRGBAlphaBitMask);
} }
if (pf->dwFlags & DDPF_ZPIXELS) if (pf->dwFlags & DDPF_ZPIXELS)
{ {
DPRINTF(" Z "); DPRINTF(cmd, pf->u5.dwRGBZBitMask); TRACE(" Z "); TRACE(cmd, pf->u5.dwRGBZBitMask);
} }
} }
if (pf->dwFlags & DDPF_ZBUFFER) if (pf->dwFlags & DDPF_ZBUFFER)
{ {
DPRINTF(", Z bits : %d", pf->u1.dwZBufferBitDepth); TRACE(", Z bits : %d", pf->u1.dwZBufferBitDepth);
} }
if (pf->dwFlags & DDPF_ALPHA) if (pf->dwFlags & DDPF_ALPHA)
{ {
DPRINTF(", Alpha bits : %d", pf->u1.dwAlphaBitDepth); TRACE(", Alpha bits : %d", pf->u1.dwAlphaBitDepth);
} }
if (pf->dwFlags & DDPF_BUMPDUDV) if (pf->dwFlags & DDPF_BUMPDUDV)
{ {
const char *cmd = "%08lx"; const char *cmd = "%08lx";
DPRINTF(", Bump bits: %d, ", pf->u1.dwBumpBitCount); TRACE(", Bump bits: %d, ", pf->u1.dwBumpBitCount);
DPRINTF(" U "); DPRINTF(cmd, pf->u2.dwBumpDuBitMask); TRACE(" U "); TRACE(cmd, pf->u2.dwBumpDuBitMask);
DPRINTF(" V "); DPRINTF(cmd, pf->u3.dwBumpDvBitMask); TRACE(" V "); TRACE(cmd, pf->u3.dwBumpDvBitMask);
DPRINTF(" L "); DPRINTF(cmd, pf->u4.dwBumpLuminanceBitMask); TRACE(" L "); TRACE(cmd, pf->u4.dwBumpLuminanceBitMask);
} }
DPRINTF(")"); TRACE(")");
} }
void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd)
...@@ -856,7 +856,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) ...@@ -856,7 +856,7 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd)
if (NULL == lpddsd) if (NULL == lpddsd)
{ {
DPRINTF("(null)\n"); TRACE("(null)\n");
} }
else else
{ {
...@@ -876,10 +876,10 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) ...@@ -876,10 +876,10 @@ void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd)
void void
dump_D3DMATRIX(const D3DMATRIX *mat) dump_D3DMATRIX(const D3DMATRIX *mat)
{ {
DPRINTF(" %f %f %f %f\n", mat->_11, mat->_12, mat->_13, mat->_14); TRACE(" %f %f %f %f\n", mat->_11, mat->_12, mat->_13, mat->_14);
DPRINTF(" %f %f %f %f\n", mat->_21, mat->_22, mat->_23, mat->_24); TRACE(" %f %f %f %f\n", mat->_21, mat->_22, mat->_23, mat->_24);
DPRINTF(" %f %f %f %f\n", mat->_31, mat->_32, mat->_33, mat->_34); TRACE(" %f %f %f %f\n", mat->_31, mat->_32, mat->_33, mat->_34);
DPRINTF(" %f %f %f %f\n", mat->_41, mat->_42, mat->_43, mat->_44); TRACE(" %f %f %f %f\n", mat->_41, mat->_42, mat->_43, mat->_44);
} }
DWORD DWORD
...@@ -945,7 +945,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) ...@@ -945,7 +945,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel)
if (TRACE_ON(ddraw)) if (TRACE_ON(ddraw))
{ {
DPRINTF(" - "); TRACE(" - ");
DDRAW_dump_flags(cooplevel, flags, sizeof(flags)/sizeof(flags[0])); DDRAW_dump_flags(cooplevel, flags, sizeof(flags)/sizeof(flags[0]));
} }
} }
...@@ -1104,21 +1104,21 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps) ...@@ -1104,21 +1104,21 @@ void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps)
FE(DDSVCAPS_STEREOSEQUENTIAL), FE(DDSVCAPS_STEREOSEQUENTIAL),
}; };
DPRINTF(" - dwSize : %d\n", lpcaps->dwSize); TRACE(" - dwSize : %d\n", lpcaps->dwSize);
DPRINTF(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0])); TRACE(" - dwCaps : "); DDRAW_dump_flags(lpcaps->dwCaps, flags1, sizeof(flags1)/sizeof(flags1[0]));
DPRINTF(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0])); TRACE(" - dwCaps2 : "); DDRAW_dump_flags(lpcaps->dwCaps2, flags2, sizeof(flags2)/sizeof(flags2[0]));
DPRINTF(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0])); TRACE(" - dwCKeyCaps : "); DDRAW_dump_flags(lpcaps->dwCKeyCaps, flags3, sizeof(flags3)/sizeof(flags3[0]));
DPRINTF(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, sizeof(flags4)/sizeof(flags4[0])); TRACE(" - dwFXCaps : "); DDRAW_dump_flags(lpcaps->dwFXCaps, flags4, sizeof(flags4)/sizeof(flags4[0]));
DPRINTF(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, sizeof(flags5)/sizeof(flags5[0])); TRACE(" - dwFXAlphaCaps : "); DDRAW_dump_flags(lpcaps->dwFXAlphaCaps, flags5, sizeof(flags5)/sizeof(flags5[0]));
DPRINTF(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0])); TRACE(" - dwPalCaps : "); DDRAW_dump_flags(lpcaps->dwPalCaps, flags6, sizeof(flags6)/sizeof(flags6[0]));
DPRINTF(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0])); TRACE(" - dwSVCaps : "); DDRAW_dump_flags(lpcaps->dwSVCaps, flags7, sizeof(flags7)/sizeof(flags7[0]));
DPRINTF("...\n"); TRACE("...\n");
DPRINTF(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes); TRACE(" - dwNumFourCCCodes : %d\n", lpcaps->dwNumFourCCCodes);
DPRINTF(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays); TRACE(" - dwCurrVisibleOverlays : %d\n", lpcaps->dwCurrVisibleOverlays);
DPRINTF(" - dwMinOverlayStretch : %d\n", lpcaps->dwMinOverlayStretch); TRACE(" - dwMinOverlayStretch : %d\n", lpcaps->dwMinOverlayStretch);
DPRINTF(" - dwMaxOverlayStretch : %d\n", lpcaps->dwMaxOverlayStretch); TRACE(" - dwMaxOverlayStretch : %d\n", lpcaps->dwMaxOverlayStretch);
DPRINTF("...\n"); TRACE("...\n");
DPRINTF(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); DPRINTF("\n"); TRACE(" - ddsCaps : "); DDRAW_dump_DDSCAPS2(&lpcaps->ddsCaps); TRACE("\n");
} }
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment