ChangeSet ID: 16920 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@wine.codeweavers.com 2005/03/29 13:01:01
Modified files: include/wine : wined3d_interface.h dlls/wined3d : wined3d_private.h volumetexture.c volume.c vertexbuffer.c texture.c surface.c resource.c indexbuffer.c drawprim.c directx.c device.c cubetexture.c basetexture.c dlls/d3d9 : volumetexture.c volume.c texture.c directx.c device.c d3d9_private.h cubetexture.c dlls/d3d8 : directx.c
Log message: Oliver Stieber oliver_stieber@yahoo.co.uk - Volume now inherits Resource. This isn't the way Microsoft implements the interface but it is more correct way (Microsoft even have a resource type of volume). - Moved usage, format, allocatedMemory and size onto the resource class structure. - Refactored Preload for classes that inherit BaseTexture, preload now binds the texture instead of bind texture calling preload, bindTexture allocated a glTexture if there isn't one. - Added two new class static members BaseTexture_CleanUp and Resource_CleanUp that should be called by classes that implement BaseTexture or Resource.
Patch: http://cvs.winehq.org/patch.py?id=16920
Old revision New revision Changes Path 1.31 1.32 +31 -21 wine/include/wine/wined3d_interface.h 1.27 1.28 +16 -22 wine/dlls/wined3d/wined3d_private.h 1.3 1.4 +7 -53 wine/dlls/wined3d/volumetexture.c 1.3 1.4 +54 -47 wine/dlls/wined3d/volume.c 1.9 1.10 +8 -12 wine/dlls/wined3d/vertexbuffer.c 1.3 1.4 +8 -72 wine/dlls/wined3d/texture.c 1.8 1.9 +79 -80 wine/dlls/wined3d/surface.c 1.6 1.7 +10 -1 wine/dlls/wined3d/resource.c 1.7 1.8 +6 -10 wine/dlls/wined3d/indexbuffer.c 1.7 1.8 +1 -1 wine/dlls/wined3d/drawprim.c 1.26 1.27 +9 -9 wine/dlls/wined3d/directx.c 1.28 1.29 +35 -46 wine/dlls/wined3d/device.c 1.3 1.4 +9 -71 wine/dlls/wined3d/cubetexture.c 1.7 1.8 +72 -4 wine/dlls/wined3d/basetexture.c 1.11 1.12 +1 -1 wine/dlls/d3d9/volumetexture.c 1.11 1.12 +1 -1 wine/dlls/d3d9/volume.c 1.13 1.14 +1 -1 wine/dlls/d3d9/texture.c 1.18 1.19 +2 -2 wine/dlls/d3d9/directx.c 1.22 1.23 +2 -2 wine/dlls/d3d9/device.c 1.14 1.15 +2 -2 wine/dlls/d3d9/d3d9_private.h 1.12 1.13 +1 -1 wine/dlls/d3d9/cubetexture.c 1.86 1.87 +2 -2 wine/dlls/d3d8/directx.c