Changelog:
- fix bad TRACE
- fixed computation of memory used by a texture
--
Lionel Ulmer - http://www.bbrox.org/
--- ../wine_base/dlls/ddraw/d3dtexture.c Sun Dec 15 22:06:43 2002
+++ dlls/ddraw/d3dtexture.c Sun Dec 15 22:09:36 2002
@@ -652,8 +652,7 @@
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;
--- ../wine_base/dlls/ddraw/ddraw/main.c Sun Dec 15 22:06:43 2002
+++ dlls/ddraw/ddraw/main.c Sun Dec 15 22:08:18 2002
@@ -1115,7 +1115,7 @@
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 */
