From 6ac84072da7e96bc59f96b8f220bc724490fd58d Mon Sep 17 00:00:00 2001 From: Lionel Ulmer Date: Mon, 16 Dec 2002 23:10:27 +0000 Subject: [PATCH] - fix bad TRACE - fixed computation of memory used by a texture --- dlls/ddraw/d3dtexture.c | 3 +-- dlls/ddraw/ddraw/main.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c index 488f431c00e..6f3ef212141 100644 --- a/dlls/ddraw/d3dtexture.c +++ b/dlls/ddraw/d3dtexture.c @@ -652,8 +652,7 @@ GL_IDirect3DTextureImpl_2_1T_Load(LPDIRECT3DTEXTURE2 iface, if (glThis->loaded == FALSE) { /* Only check memory for not already loaded texture... */ mem_used = This->surface_desc.dwHeight * - This->surface_desc.dwHeight * - This->surface_desc.u4.ddpfPixelFormat.u1.dwRGBBitCount; + This->surface_desc.u1.lPitch; if (This->ddraw_owner->allocate_memory(This->ddraw_owner, mem_used) < 0) { TRACE(" out of virtual memory... Warning application.\n"); return D3DERR_TEXTURE_LOAD_FAILED; diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c index b076cb808ca..a3302b08654 100644 --- a/dlls/ddraw/ddraw/main.c +++ b/dlls/ddraw/ddraw/main.c @@ -1115,7 +1115,7 @@ Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, if (TRACE_ON(ddraw)) { TRACE(" Asking for memory of type : \n"); - DDRAW_dump_DDSCAPS2(ddscaps); + DDRAW_dump_DDSCAPS2(ddscaps); DPRINTF("\n"); } /* We have 16 MB videomemory */