ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D8Wrapper: More logging

This commit is contained in:
pjgat09 2014-08-25 22:21:59 +00:00
parent ed6aeeba45
commit 084ed67742
13 changed files with 161 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libmupen64plus/D3D8Interceptor/Direct3D8Functions.cpp
View File

@ -30,7 +30,7 @@ extern "C"
STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3D8::Release(THIS) STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3D8::Release(THIS)
{ {
LOG("IDirect3D8::Release( " << this << " )\n"); LOG("IDirect3D8::Release() [ " << this << " ]\n");
m_pUnk->Release(); m_pUnk->Release();
ULONG ulRef = --m_ulRef; ULONG ulRef = --m_ulRef;
@ -49,79 +49,79 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3D8::GetAdapterDisplayMode(THIS_ UINT Adapter,D3D8Base::D3DDISPLAYMODE* pMode) STDMETHODIMP D3D8Wrapper::IDirect3D8::GetAdapterDisplayMode(THIS_ UINT Adapter,D3D8Base::D3DDISPLAYMODE* pMode)
{ {
LOG("IDirect3D8::GetAdapterDisplayMode( " << Adapter << " , " << pMode << " )\n"); LOG("IDirect3D8::GetAdapterDisplayMode( " << Adapter << " , " << pMode << " ) [ " << this << " ]\n");
return m_pD3D->GetAdapterDisplayMode(Adapter, pMode); return m_pD3D->GetAdapterDisplayMode(Adapter, pMode);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::RegisterSoftwareDevice(void* pInitializeFunction) STDMETHODIMP D3D8Wrapper::IDirect3D8::RegisterSoftwareDevice(void* pInitializeFunction)
{ {
LOG("IDirect3D8::RegisterSoftwareDevice( " << pInitializeFunction << " )\n"); LOG("IDirect3D8::RegisterSoftwareDevice( " << pInitializeFunction << " ) [ " << this << " ]\n");
return m_pD3D->RegisterSoftwareDevice(pInitializeFunction); return m_pD3D->RegisterSoftwareDevice(pInitializeFunction);
} }
STDMETHODIMP_(UINT) D3D8Wrapper::IDirect3D8::GetAdapterCount(THIS) STDMETHODIMP_(UINT) D3D8Wrapper::IDirect3D8::GetAdapterCount(THIS)
{ {
LOG("IDirect3D8::GetAdapterCount()\n"); LOG("IDirect3D8::GetAdapterCount() [ " << this << " ]\n");
return m_pD3D->GetAdapterCount(); return m_pD3D->GetAdapterCount();
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3D8Base::D3DADAPTER_IDENTIFIER8* pIdentifier) STDMETHODIMP D3D8Wrapper::IDirect3D8::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3D8Base::D3DADAPTER_IDENTIFIER8* pIdentifier)
{ {
LOG("IDirect3D8::GetAdapterIdentifier( " << Adapter << " , " << Flags << " , " << pIdentifier << " )\n"); LOG("IDirect3D8::GetAdapterIdentifier( " << Adapter << " , " << Flags << " , " << pIdentifier << " ) [ " << this << " ]\n");
return m_pD3D->GetAdapterIdentifier(Adapter,Flags,pIdentifier); return m_pD3D->GetAdapterIdentifier(Adapter,Flags,pIdentifier);
} }
STDMETHODIMP_(UINT) D3D8Wrapper::IDirect3D8::GetAdapterModeCount(UINT Adapter) STDMETHODIMP_(UINT) D3D8Wrapper::IDirect3D8::GetAdapterModeCount(UINT Adapter)
{ {
LOG("IDirect3D8::GetAdapterModeCount( " << Adapter << " )\n"); LOG("IDirect3D8::GetAdapterModeCount( " << Adapter << " ) [ " << this << " ]\n");
return m_pD3D->GetAdapterModeCount(Adapter); return m_pD3D->GetAdapterModeCount(Adapter);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::EnumAdapterModes(UINT Adapter,UINT Mode,D3D8Base::D3DDISPLAYMODE* pMode) STDMETHODIMP D3D8Wrapper::IDirect3D8::EnumAdapterModes(UINT Adapter,UINT Mode,D3D8Base::D3DDISPLAYMODE* pMode)
{ {
LOG("IDirect3D8::EnumAdapterModes( " << Adapter << " , " << Mode << " , " << pMode << " )\n"); LOG("IDirect3D8::EnumAdapterModes( " << Adapter << " , " << Mode << " , " << pMode << " ) [ " << this << " ]\n");
return m_pD3D->EnumAdapterModes(Adapter,Mode,pMode); return m_pD3D->EnumAdapterModes(Adapter,Mode,pMode);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDeviceType(UINT Adapter,D3D8Base::D3DDEVTYPE CheckType,D3D8Base::D3DFORMAT DisplayFormat,D3D8Base::D3DFORMAT BackBufferFormat,BOOL Windowed) STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDeviceType(UINT Adapter,D3D8Base::D3DDEVTYPE CheckType,D3D8Base::D3DFORMAT DisplayFormat,D3D8Base::D3DFORMAT BackBufferFormat,BOOL Windowed)
{ {
LOG("IDirect3D8::CheckDeviceType( " << Adapter << " , " << CheckType << " , " << DisplayFormat << " , " << BackBufferFormat << " , " << Windowed << " )\n"); LOG("IDirect3D8::CheckDeviceType( " << Adapter << " , " << CheckType << " , " << DisplayFormat << " , " << BackBufferFormat << " , " << Windowed << " ) [ " << this << " ]\n");
return m_pD3D->CheckDeviceType(Adapter,CheckType,DisplayFormat,BackBufferFormat,Windowed); return m_pD3D->CheckDeviceType(Adapter,CheckType,DisplayFormat,BackBufferFormat,Windowed);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDeviceFormat(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DFORMAT AdapterFormat,DWORD Usage,D3D8Base::D3DRESOURCETYPE RType,D3D8Base::D3DFORMAT CheckFormat) STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDeviceFormat(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DFORMAT AdapterFormat,DWORD Usage,D3D8Base::D3DRESOURCETYPE RType,D3D8Base::D3DFORMAT CheckFormat)
{ {
LOG("IDirect3D8::CheckDeviceFormat( " << Adapter << " , " << DeviceType << " , " << AdapterFormat << " , " << Usage << " , " << RType << " , " << CheckFormat << " )\n"); LOG("IDirect3D8::CheckDeviceFormat( " << Adapter << " , " << DeviceType << " , " << AdapterFormat << " , " << Usage << " , " << RType << " , " << CheckFormat << " ) [ " << this << " ]\n");
return m_pD3D->CheckDeviceFormat(Adapter,DeviceType,AdapterFormat,Usage,RType,CheckFormat); return m_pD3D->CheckDeviceFormat(Adapter,DeviceType,AdapterFormat,Usage,RType,CheckFormat);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDeviceMultiSampleType(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DFORMAT SurfaceFormat,BOOL Windowed,D3D8Base::D3DMULTISAMPLE_TYPE MultiSampleType) STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDeviceMultiSampleType(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DFORMAT SurfaceFormat,BOOL Windowed,D3D8Base::D3DMULTISAMPLE_TYPE MultiSampleType)
{ {
LOG("IDirect3D8::CheckDeviceMultiSampleType( " << Adapter << " , " << DeviceType << " , " << SurfaceFormat << " , " << Windowed << " , " << MultiSampleType << " )\n"); LOG("IDirect3D8::CheckDeviceMultiSampleType( " << Adapter << " , " << DeviceType << " , " << SurfaceFormat << " , " << Windowed << " , " << MultiSampleType << " ) [ " << this << " ]\n");
return m_pD3D->CheckDeviceMultiSampleType(Adapter,DeviceType,SurfaceFormat,Windowed,MultiSampleType); return m_pD3D->CheckDeviceMultiSampleType(Adapter,DeviceType,SurfaceFormat,Windowed,MultiSampleType);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDepthStencilMatch(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DFORMAT AdapterFormat,D3D8Base::D3DFORMAT RenderTargetFormat,D3D8Base::D3DFORMAT DepthStencilFormat) STDMETHODIMP D3D8Wrapper::IDirect3D8::CheckDepthStencilMatch(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DFORMAT AdapterFormat,D3D8Base::D3DFORMAT RenderTargetFormat,D3D8Base::D3DFORMAT DepthStencilFormat)
{ {
LOG("IDirect3D8::CheckDepthStencilMatch( " << Adapter << " , " << DeviceType << " , " << AdapterFormat << " , " << RenderTargetFormat << " , " << DepthStencilFormat << " )\n"); LOG("IDirect3D8::CheckDepthStencilMatch( " << Adapter << " , " << DeviceType << " , " << AdapterFormat << " , " << RenderTargetFormat << " , " << DepthStencilFormat << " ) [ " << this << " ]\n");
return m_pD3D->CheckDepthStencilMatch(Adapter,DeviceType,AdapterFormat,RenderTargetFormat,DepthStencilFormat); return m_pD3D->CheckDepthStencilMatch(Adapter,DeviceType,AdapterFormat,RenderTargetFormat,DepthStencilFormat);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::GetDeviceCaps(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DCAPS8* pCaps) STDMETHODIMP D3D8Wrapper::IDirect3D8::GetDeviceCaps(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,D3D8Base::D3DCAPS8* pCaps)
{ {
LOG("IDirect3D8::GetDeviceCaps( " << Adapter << " , " << DeviceType << " , " << pCaps << " )\n"); LOG("IDirect3D8::GetDeviceCaps( " << Adapter << " , " << DeviceType << " , " << pCaps << " ) [ " << this << " ]\n");
return m_pD3D->GetDeviceCaps(Adapter,DeviceType,pCaps); return m_pD3D->GetDeviceCaps(Adapter,DeviceType,pCaps);
} }
STDMETHODIMP_(HMONITOR) D3D8Wrapper::IDirect3D8::GetAdapterMonitor(UINT Adapter) STDMETHODIMP_(HMONITOR) D3D8Wrapper::IDirect3D8::GetAdapterMonitor(UINT Adapter)
{ {
LOG("IDirect3D8::GetAdapterMonitor( " << Adapter << " )\n"); LOG("IDirect3D8::GetAdapterMonitor( " << Adapter << " ) [ " << this << " ]\n");
return m_pD3D->GetAdapterMonitor(Adapter); return m_pD3D->GetAdapterMonitor(Adapter);
} }
STDMETHODIMP D3D8Wrapper::IDirect3D8::CreateDevice(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,HWND hFocusWindow,DWORD BehaviorFlags,D3D8Base::D3DPRESENT_PARAMETERS* pPresentationParameters,D3D8Wrapper::IDirect3DDevice8** ppReturnedDeviceInterface) STDMETHODIMP D3D8Wrapper::IDirect3D8::CreateDevice(UINT Adapter,D3D8Base::D3DDEVTYPE DeviceType,HWND hFocusWindow,DWORD BehaviorFlags,D3D8Base::D3DPRESENT_PARAMETERS* pPresentationParameters,D3D8Wrapper::IDirect3DDevice8** ppReturnedDeviceInterface)
{ {
LOG("IDirect3D8::CreateDevice( " << Adapter << " , " << DeviceType << " , " << hFocusWindow << " , " << BehaviorFlags << " , " << pPresentationParameters << " , " << ppReturnedDeviceInterface << " )\n"); LOG("IDirect3D8::CreateDevice( " << Adapter << " , " << DeviceType << " , " << hFocusWindow << " , " << BehaviorFlags << " , " << pPresentationParameters << " , " << ppReturnedDeviceInterface << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DDevice8* realDevice = NULL; D3D8Base::IDirect3DDevice8* realDevice = NULL;
HRESULT hr = m_pD3D->CreateDevice(Adapter,DeviceType,hFocusWindow,BehaviorFlags,pPresentationParameters,&realDevice); HRESULT hr = m_pD3D->CreateDevice(Adapter,DeviceType,hFocusWindow,BehaviorFlags,pPresentationParameters,&realDevice);

6
libmupen64plus/D3D8Interceptor/Direct3DBaseTexture8Functions.cpp
View File

@ -12,19 +12,19 @@ extern "C"
STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DBaseTexture8::SetLOD(DWORD LODNew) STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DBaseTexture8::SetLOD(DWORD LODNew)
{ {
LOG("IDirect3DBaseTexture8::SetLOD( " << LODNew << " )\n"); LOG("IDirect3DBaseTexture8::SetLOD( " << LODNew << " ) [ " << this << " ]\n");
return m_pD3D->SetLOD(LODNew); return m_pD3D->SetLOD(LODNew);
} }
STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DBaseTexture8::GetLOD() STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DBaseTexture8::GetLOD()
{ {
LOG("IDirect3DBaseTexture8::GetLOD()\n"); LOG("IDirect3DBaseTexture8::GetLOD() [ " << this << " ]\n");
return m_pD3D->GetLOD(); return m_pD3D->GetLOD();
} }
STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DBaseTexture8::GetLevelCount() STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DBaseTexture8::GetLevelCount()
{ {
LOG("IDirect3DBaseTexture8::GetLevelCount()\n"); LOG("IDirect3DBaseTexture8::GetLevelCount() [ " << this << " ]\n");
return m_pD3D->GetLevelCount(); return m_pD3D->GetLevelCount();
} }
} }

10
libmupen64plus/D3D8Interceptor/Direct3DCubeTexture8Functions.cpp
View File

@ -12,13 +12,13 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::GetLevelDesc(UINT Level,D3D8Base::D3DSURFACE_DESC *pDesc) STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::GetLevelDesc(UINT Level,D3D8Base::D3DSURFACE_DESC *pDesc)
{ {
LOG("IDirect3DCubeTexture8::GetLevelDesc( " << pDesc << " )\n"); LOG("IDirect3DCubeTexture8::GetLevelDesc( " << pDesc << " ) [ " << this << " ]\n");
return m_pD3D->GetLevelDesc(Level,pDesc); return m_pD3D->GetLevelDesc(Level,pDesc);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::GetCubeMapSurface(D3D8Base::D3DCUBEMAP_FACES FaceType,UINT Level,D3D8Wrapper::IDirect3DSurface8** ppCubeMapSurface) STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::GetCubeMapSurface(D3D8Base::D3DCUBEMAP_FACES FaceType,UINT Level,D3D8Wrapper::IDirect3DSurface8** ppCubeMapSurface)
{ {
LOG("IDirect3DCubeTexture8::GetCubeMapSurface( " << FaceType << " , " << Level << " , " << ppCubeMapSurface << " )\n"); LOG("IDirect3DCubeTexture8::GetCubeMapSurface( " << FaceType << " , " << Level << " , " << ppCubeMapSurface << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -33,19 +33,19 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::LockRect(D3D8Base::D3DCUBEMAP_FACES FaceType,UINT Level,D3D8Base::D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::LockRect(D3D8Base::D3DCUBEMAP_FACES FaceType,UINT Level,D3D8Base::D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags)
{ {
LOG("IDirect3DCubeTexture8::LockRect( " << FaceType << " , " << Level << " , " << pLockedRect << " , " << pRect << " , " << Flags << " )\n"); LOG("IDirect3DCubeTexture8::LockRect( " << FaceType << " , " << Level << " , " << pLockedRect << " , " << pRect << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->LockRect(FaceType,Level,pLockedRect,pRect,Flags); return m_pD3D->LockRect(FaceType,Level,pLockedRect,pRect,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::UnlockRect(D3D8Base::D3DCUBEMAP_FACES FaceType,UINT Level) STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::UnlockRect(D3D8Base::D3DCUBEMAP_FACES FaceType,UINT Level)
{ {
LOG("IDirect3DCubeTexture8::UnlockRect( " << FaceType << " , " << Level << " )\n"); LOG("IDirect3DCubeTexture8::UnlockRect( " << FaceType << " , " << Level << " ) [ " << this << " ]\n");
return m_pD3D->UnlockRect(FaceType,Level); return m_pD3D->UnlockRect(FaceType,Level);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::AddDirtyRect(D3D8Base::D3DCUBEMAP_FACES FaceType,CONST RECT* pDirtyRect) STDMETHODIMP D3D8Wrapper::IDirect3DCubeTexture8::AddDirtyRect(D3D8Base::D3DCUBEMAP_FACES FaceType,CONST RECT* pDirtyRect)
{ {
LOG("IDirect3DCubeTexture8::AddDirtyRect( " << FaceType << " , " << pDirtyRect << " )\n"); LOG("IDirect3DCubeTexture8::AddDirtyRect( " << FaceType << " , " << pDirtyRect << " ) [ " << this << " ]\n");
return m_pD3D->AddDirtyRect(FaceType,pDirtyRect); return m_pD3D->AddDirtyRect(FaceType,pDirtyRect);
} }
} }

190
libmupen64plus/D3D8Interceptor/Direct3DDevice8Functions.cpp
View File

@ -29,7 +29,7 @@ extern "C"
STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DDevice8::Release(THIS) STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DDevice8::Release(THIS)
{ {
LOG("IDirect3DDevice8::Release " << this << "\n"); LOG("IDirect3DDevice8::Release() [ " << this << " ]\n");
m_pUnk->Release(); m_pUnk->Release();
ULONG ulRef = --m_ulRef; ULONG ulRef = --m_ulRef;
@ -46,25 +46,25 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::TestCooperativeLevel() STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::TestCooperativeLevel()
{ {
LOG("IDirect3DDevice8::TestCooperativeLevel()\n"); LOG("IDirect3DDevice8::TestCooperativeLevel() [ " << this << " ]\n");
return m_pDevice->TestCooperativeLevel(); return m_pDevice->TestCooperativeLevel();
} }
STDMETHODIMP_(UINT) D3D8Wrapper::IDirect3DDevice8::GetAvailableTextureMem() STDMETHODIMP_(UINT) D3D8Wrapper::IDirect3DDevice8::GetAvailableTextureMem()
{ {
LOG("IDirect3DDevice8::GetAvailableTextureMem()\n"); LOG("IDirect3DDevice8::GetAvailableTextureMem() [ " << this << " ]\n");
return m_pDevice->GetAvailableTextureMem(); return m_pDevice->GetAvailableTextureMem();
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ResourceManagerDiscardBytes(DWORD Bytes) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ResourceManagerDiscardBytes(DWORD Bytes)
{ {
LOG("IDirect3DDevice8::ResourceManagerDiscardBytes( " << Bytes << " )\n"); LOG("IDirect3DDevice8::ResourceManagerDiscardBytes( " << Bytes << " ) [ " << this << " ]\n");
return m_pDevice->ResourceManagerDiscardBytes(Bytes); return m_pDevice->ResourceManagerDiscardBytes(Bytes);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDirect3D(D3D8Wrapper::IDirect3D8** ppD3D8) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDirect3D(D3D8Wrapper::IDirect3D8** ppD3D8)
{ {
LOG("IDirect3DDevice8::GetDirect3D( " << ppD3D8 << " )\n"); LOG("IDirect3DDevice8::GetDirect3D( " << ppD3D8 << " ) [ " << this << " ]\n");
// Run the function and wrap the result before returning it // Run the function and wrap the result before returning it
D3D8Base::IDirect3D8* realD3D = NULL; D3D8Base::IDirect3D8* realD3D = NULL;
@ -80,25 +80,25 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDeviceCaps(D3D8Base::D3DCAPS8* pCaps) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDeviceCaps(D3D8Base::D3DCAPS8* pCaps)
{ {
LOG("IDirect3DDevice8::GetDeviceCaps( " << pCaps << " )\n"); LOG("IDirect3DDevice8::GetDeviceCaps( " << pCaps << " ) [ " << this << " ]\n");
return m_pDevice->GetDeviceCaps(pCaps); return m_pDevice->GetDeviceCaps(pCaps);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDisplayMode(D3D8Base::D3DDISPLAYMODE* pMode) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDisplayMode(D3D8Base::D3DDISPLAYMODE* pMode)
{ {
LOG("IDirect3DDevice8::GetDisplayMode( " << pMode << " )\n"); LOG("IDirect3DDevice8::GetDisplayMode( " << pMode << " ) [ " << this << " ]\n");
return m_pDevice->GetDisplayMode(pMode); return m_pDevice->GetDisplayMode(pMode);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetCreationParameters(D3D8Base::D3DDEVICE_CREATION_PARAMETERS *pParameters) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetCreationParameters(D3D8Base::D3DDEVICE_CREATION_PARAMETERS *pParameters)
{ {
LOG("IDirect3DDevice8::GetCreationParameters( " << pParameters << " )\n"); LOG("IDirect3DDevice8::GetCreationParameters( " << pParameters << " ) [ " << this << " ]\n");
return m_pDevice->GetCreationParameters(pParameters); return m_pDevice->GetCreationParameters(pParameters);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetCursorProperties(UINT XHotSpot,UINT YHotSpot,D3D8Wrapper::IDirect3DSurface8* pCursorBitmap) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetCursorProperties(UINT XHotSpot,UINT YHotSpot,D3D8Wrapper::IDirect3DSurface8* pCursorBitmap)
{ {
LOG("IDirect3DDevice8::SetCursorProperties( " << XHotSpot << " , " << YHotSpot << " , " << pCursorBitmap << " )\n"); LOG("IDirect3DDevice8::SetCursorProperties( " << XHotSpot << " , " << YHotSpot << " , " << pCursorBitmap << " ) [ " << this << " ]\n");
if (pCursorBitmap == NULL) if (pCursorBitmap == NULL)
{ {
return m_pDevice->SetCursorProperties(XHotSpot,YHotSpot,NULL); return m_pDevice->SetCursorProperties(XHotSpot,YHotSpot,NULL);
@ -111,19 +111,19 @@ extern "C"
STDMETHODIMP_(void) D3D8Wrapper::IDirect3DDevice8::SetCursorPosition(int X,int Y,DWORD Flags) STDMETHODIMP_(void) D3D8Wrapper::IDirect3DDevice8::SetCursorPosition(int X,int Y,DWORD Flags)
{ {
LOG("IDirect3DDevice8::SetCursorPosition( " << X << " , " << Y << " , " << Flags << " )\n"); LOG("IDirect3DDevice8::SetCursorPosition( " << X << " , " << Y << " , " << Flags << " ) [ " << this << " ]\n");
m_pDevice->SetCursorPosition(X,Y,Flags); m_pDevice->SetCursorPosition(X,Y,Flags);
} }
STDMETHODIMP_(BOOL) D3D8Wrapper::IDirect3DDevice8::ShowCursor(BOOL bShow) STDMETHODIMP_(BOOL) D3D8Wrapper::IDirect3DDevice8::ShowCursor(BOOL bShow)
{ {
LOG("IDirect3DDevice8::ShowCursor( " << bShow << " )\n"); LOG("IDirect3DDevice8::ShowCursor( " << bShow << " ) [ " << this << " ]\n");
return m_pDevice->ShowCursor(bShow); return m_pDevice->ShowCursor(bShow);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateAdditionalSwapChain(D3D8Base::D3DPRESENT_PARAMETERS* pPresentationParameters,D3D8Wrapper::IDirect3DSwapChain8** pSwapChain) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateAdditionalSwapChain(D3D8Base::D3DPRESENT_PARAMETERS* pPresentationParameters,D3D8Wrapper::IDirect3DSwapChain8** pSwapChain)
{ {
LOG("IDirect3DDevice8::CreateAdditionalSwapChain( " << pPresentationParameters << " , " << pSwapChain << " )\n"); LOG("IDirect3DDevice8::CreateAdditionalSwapChain( " << pPresentationParameters << " , " << pSwapChain << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSwapChain8* realD3D = NULL; D3D8Base::IDirect3DSwapChain8* realD3D = NULL;
HRESULT hr = m_pDevice->CreateAdditionalSwapChain(pPresentationParameters,&realD3D); HRESULT hr = m_pDevice->CreateAdditionalSwapChain(pPresentationParameters,&realD3D);
@ -137,7 +137,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::Reset(D3D8Base::D3DPRESENT_PARAMETERS* pPresentationParameters) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::Reset(D3D8Base::D3DPRESENT_PARAMETERS* pPresentationParameters)
{ {
LOG("IDirect3DDevice8::Reset( " << pPresentationParameters << " )\n"); LOG("IDirect3DDevice8::Reset( " << pPresentationParameters << " ) [ " << this << " ]\n");
return m_pDevice->Reset(pPresentationParameters); return m_pDevice->Reset(pPresentationParameters);
} }
@ -154,7 +154,7 @@ extern "C"
{ {
LOG("{ " << pDestRect->left << " , " << pDestRect->top << " , " << pDestRect->right << " , " << pDestRect->bottom << " }"); LOG("{ " << pDestRect->left << " , " << pDestRect->top << " , " << pDestRect->right << " , " << pDestRect->bottom << " }");
} }
LOG(" , " << hDestWindowOverride << " , " << pDirtyRegion << " )\n"); LOG(" , " << hDestWindowOverride << " , " << pDirtyRegion << " ) [ " << this << " ]\n");
#endif #endif
// Force the result to OK // Force the result to OK
HRESULT hr = D3D_OK; HRESULT hr = D3D_OK;
@ -170,7 +170,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetBackBuffer(UINT BackBuffer,D3D8Base::D3DBACKBUFFER_TYPE Type,D3D8Wrapper::IDirect3DSurface8** ppBackBuffer) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetBackBuffer(UINT BackBuffer,D3D8Base::D3DBACKBUFFER_TYPE Type,D3D8Wrapper::IDirect3DSurface8** ppBackBuffer)
{ {
LOG("IDirect3DDevice8::GetBackBuffer( " << BackBuffer << " , " << Type << " , " << ppBackBuffer << " )\n"); LOG("IDirect3DDevice8::GetBackBuffer( " << BackBuffer << " , " << Type << " , " << ppBackBuffer << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -185,25 +185,25 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetRasterStatus(D3D8Base::D3DRASTER_STATUS* pRasterStatus) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetRasterStatus(D3D8Base::D3DRASTER_STATUS* pRasterStatus)
{ {
LOG("IDirect3DDevice8::GetRasterStatus( " << pRasterStatus << " )\n"); LOG("IDirect3DDevice8::GetRasterStatus( " << pRasterStatus << " ) [ " << this << " ]\n");
return m_pDevice->GetRasterStatus(pRasterStatus); return m_pDevice->GetRasterStatus(pRasterStatus);
} }
STDMETHODIMP_(void) D3D8Wrapper::IDirect3DDevice8::SetGammaRamp(DWORD Flags,CONST D3D8Base::D3DGAMMARAMP* pRamp) STDMETHODIMP_(void) D3D8Wrapper::IDirect3DDevice8::SetGammaRamp(DWORD Flags,CONST D3D8Base::D3DGAMMARAMP* pRamp)
{ {
LOG("IDirect3DDevice8::SetGammaRamp( " << Flags << " , " << pRamp << " )\n"); LOG("IDirect3DDevice8::SetGammaRamp( " << Flags << " , " << pRamp << " ) [ " << this << " ]\n");
m_pDevice->SetGammaRamp(Flags,pRamp); m_pDevice->SetGammaRamp(Flags,pRamp);
} }
STDMETHODIMP_(void) D3D8Wrapper::IDirect3DDevice8::GetGammaRamp(D3D8Base::D3DGAMMARAMP* pRamp) STDMETHODIMP_(void) D3D8Wrapper::IDirect3DDevice8::GetGammaRamp(D3D8Base::D3DGAMMARAMP* pRamp)
{ {
LOG("IDirect3DDevice8::GetGammaRamp( " << pRamp << " )\n"); LOG("IDirect3DDevice8::GetGammaRamp( " << pRamp << " ) [ " << this << " ]\n");
m_pDevice->GetGammaRamp(pRamp); m_pDevice->GetGammaRamp(pRamp);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateTexture(UINT Width,UINT Height,UINT Levels,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DTexture8** ppTexture) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateTexture(UINT Width,UINT Height,UINT Levels,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DTexture8** ppTexture)
{ {
LOG("IDirect3DDevice8::CreateTexture( " << Width << " , " << Height << " , " << Levels << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppTexture << " )\n"); LOG("IDirect3DDevice8::CreateTexture( " << Width << " , " << Height << " , " << Levels << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppTexture << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DTexture8* realD3D = NULL; D3D8Base::IDirect3DTexture8* realD3D = NULL;
@ -218,7 +218,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateVolumeTexture(UINT Width,UINT Height,UINT Depth,UINT Levels,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DVolumeTexture8** ppVolumeTexture) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateVolumeTexture(UINT Width,UINT Height,UINT Depth,UINT Levels,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DVolumeTexture8** ppVolumeTexture)
{ {
LOG("IDirect3DDevice8::CreateVolumeTexture( " << Width << " , " << Height << " , " << Levels << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppVolumeTexture << " )\n"); LOG("IDirect3DDevice8::CreateVolumeTexture( " << Width << " , " << Height << " , " << Levels << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppVolumeTexture << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DVolumeTexture8* realD3D = NULL; D3D8Base::IDirect3DVolumeTexture8* realD3D = NULL;
@ -233,7 +233,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateCubeTexture(UINT EdgeLength,UINT Levels,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DCubeTexture8** ppCubeTexture) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateCubeTexture(UINT EdgeLength,UINT Levels,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DCubeTexture8** ppCubeTexture)
{ {
LOG("IDirect3DDevice8::CreateCubeTexture( " << EdgeLength << " , " << Levels << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppCubeTexture << " )\n"); LOG("IDirect3DDevice8::CreateCubeTexture( " << EdgeLength << " , " << Levels << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppCubeTexture << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DCubeTexture8* realD3D = NULL; D3D8Base::IDirect3DCubeTexture8* realD3D = NULL;
@ -248,7 +248,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateVertexBuffer(UINT Length,DWORD Usage,DWORD FVF,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DVertexBuffer8** ppVertexBuffer) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateVertexBuffer(UINT Length,DWORD Usage,DWORD FVF,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DVertexBuffer8** ppVertexBuffer)
{ {
LOG("IDirect3DDevice8::CreateVertexBuffer( " << Length << " , " << Usage << " , " << FVF << " , " << Pool << " , " << ppVertexBuffer << " )\n"); LOG("IDirect3DDevice8::CreateVertexBuffer( " << Length << " , " << Usage << " , " << FVF << " , " << Pool << " , " << ppVertexBuffer << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DVertexBuffer8* realD3D = NULL; D3D8Base::IDirect3DVertexBuffer8* realD3D = NULL;
@ -263,7 +263,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateIndexBuffer(UINT Length,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DIndexBuffer8** ppIndexBuffer) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateIndexBuffer(UINT Length,DWORD Usage,D3D8Base::D3DFORMAT Format,D3D8Base::D3DPOOL Pool,D3D8Wrapper::IDirect3DIndexBuffer8** ppIndexBuffer)
{ {
LOG("IDirect3DDevice8::CreateIndexBuffer( " << Length << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppIndexBuffer << " )\n"); LOG("IDirect3DDevice8::CreateIndexBuffer( " << Length << " , " << Usage << " , " << Format << " , " << Pool << " , " << ppIndexBuffer << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DIndexBuffer8* realD3D = NULL; D3D8Base::IDirect3DIndexBuffer8* realD3D = NULL;
@ -278,7 +278,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateRenderTarget(UINT Width,UINT Height,D3D8Base::D3DFORMAT Format,D3D8Base::D3DMULTISAMPLE_TYPE MultiSample,BOOL Lockable,D3D8Wrapper::IDirect3DSurface8** ppSurface) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateRenderTarget(UINT Width,UINT Height,D3D8Base::D3DFORMAT Format,D3D8Base::D3DMULTISAMPLE_TYPE MultiSample,BOOL Lockable,D3D8Wrapper::IDirect3DSurface8** ppSurface)
{ {
LOG("IDirect3DDevice8::CreateRenderTarget( " << Width << " , " << Height << " , " << Format << " , " << MultiSample << " , " << Lockable << " , " << ppSurface << " )\n"); LOG("IDirect3DDevice8::CreateRenderTarget( " << Width << " , " << Height << " , " << Format << " , " << MultiSample << " , " << Lockable << " , " << ppSurface << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -293,7 +293,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateDepthStencilSurface(UINT Width,UINT Height,D3D8Base::D3DFORMAT Format,D3D8Base::D3DMULTISAMPLE_TYPE MultiSample,D3D8Wrapper::IDirect3DSurface8** ppSurface) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateDepthStencilSurface(UINT Width,UINT Height,D3D8Base::D3DFORMAT Format,D3D8Base::D3DMULTISAMPLE_TYPE MultiSample,D3D8Wrapper::IDirect3DSurface8** ppSurface)
{ {
LOG("IDirect3DDevice8::CreateDepthStencilSurface( " << Width << " , " << Height << " , " << Format << " , " << MultiSample << " , " << ppSurface << " )\n"); LOG("IDirect3DDevice8::CreateDepthStencilSurface( " << Width << " , " << Height << " , " << Format << " , " << MultiSample << " , " << ppSurface << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -308,7 +308,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateImageSurface(UINT Width,UINT Height,D3D8Base::D3DFORMAT Format,D3D8Wrapper::IDirect3DSurface8** ppSurface) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateImageSurface(UINT Width,UINT Height,D3D8Base::D3DFORMAT Format,D3D8Wrapper::IDirect3DSurface8** ppSurface)
{ {
LOG("IDirect3DDevice8::CreateImageSurface( " << Width << " , " << Height << " , " << Format << " , " << ppSurface << " )\n"); LOG("IDirect3DDevice8::CreateImageSurface( " << Width << " , " << Height << " , " << Format << " , " << ppSurface << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -323,7 +323,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CopyRects(D3D8Wrapper::IDirect3DSurface8* pSourceSurface,CONST RECT* pSourceRectsArray,UINT cRects,D3D8Wrapper::IDirect3DSurface8* pDestinationSurface,CONST POINT* pDestPointsArray) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CopyRects(D3D8Wrapper::IDirect3DSurface8* pSourceSurface,CONST RECT* pSourceRectsArray,UINT cRects,D3D8Wrapper::IDirect3DSurface8* pDestinationSurface,CONST POINT* pDestPointsArray)
{ {
LOG("IDirect3DDevice8::CopyRects( " << pSourceSurface << " , " << pSourceRectsArray << " , " << cRects << " , " << pDestinationSurface << " , " << pDestPointsArray << " )\n"); LOG("IDirect3DDevice8::CopyRects( " << pSourceSurface << " , " << pSourceRectsArray << " , " << cRects << " , " << pDestinationSurface << " , " << pDestPointsArray << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* source; D3D8Base::IDirect3DSurface8* source;
if (pSourceSurface == NULL) if (pSourceSurface == NULL)
@ -355,7 +355,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::UpdateTexture(D3D8Wrapper::IDirect3DBaseTexture8* pSourceTexture,D3D8Wrapper::IDirect3DBaseTexture8* pDestinationTexture) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::UpdateTexture(D3D8Wrapper::IDirect3DBaseTexture8* pSourceTexture,D3D8Wrapper::IDirect3DBaseTexture8* pDestinationTexture)
{ {
LOG("IDirect3DDevice8::UpdateTexture( " << pSourceTexture << " , " << pDestinationTexture << " )\n"); LOG("IDirect3DDevice8::UpdateTexture( " << pSourceTexture << " , " << pDestinationTexture << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DBaseTexture8* source; D3D8Base::IDirect3DBaseTexture8* source;
if (pSourceTexture == NULL) if (pSourceTexture == NULL)
{ {
@ -381,7 +381,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetFrontBuffer(D3D8Wrapper::IDirect3DSurface8* pDestSurface) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetFrontBuffer(D3D8Wrapper::IDirect3DSurface8* pDestSurface)
{ {
LOG("IDirect3DDevice8::GetFrontBuffer( " << pDestSurface << " )\n"); LOG("IDirect3DDevice8::GetFrontBuffer( " << pDestSurface << " ) [ " << this << " ]\n");
if (pDestSurface == NULL) if (pDestSurface == NULL)
{ {
return m_pDevice->GetFrontBuffer(NULL); return m_pDevice->GetFrontBuffer(NULL);
@ -394,7 +394,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetRenderTarget(D3D8Wrapper::IDirect3DSurface8* pRenderTarget,D3D8Wrapper::IDirect3DSurface8* pNewZStencil) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetRenderTarget(D3D8Wrapper::IDirect3DSurface8* pRenderTarget,D3D8Wrapper::IDirect3DSurface8* pNewZStencil)
{ {
LOG("IDirect3DDevice8::SetRenderTarget( " << pRenderTarget << " , " << pNewZStencil << " )\n"); LOG("IDirect3DDevice8::SetRenderTarget( " << pRenderTarget << " , " << pNewZStencil << " ) [ " << this << " ]\n");
//HRESULT hr = m_pDevice->SetRenderTarget(pRenderTarget->GetSurface(),pNewZStencil->GetSurface()); //HRESULT hr = m_pDevice->SetRenderTarget(pRenderTarget->GetSurface(),pNewZStencil->GetSurface());
HRESULT hr = m_pDevice->SetRenderTarget(render_surface->GetSurface(),pNewZStencil->GetSurface()); HRESULT hr = m_pDevice->SetRenderTarget(render_surface->GetSurface(),pNewZStencil->GetSurface());
@ -407,7 +407,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetRenderTarget(D3D8Wrapper::IDirect3DSurface8** ppRenderTarget) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetRenderTarget(D3D8Wrapper::IDirect3DSurface8** ppRenderTarget)
{ {
LOG("IDirect3DDevice8::GetRenderTarget( " << ppRenderTarget << " )\n"); LOG("IDirect3DDevice8::GetRenderTarget( " << ppRenderTarget << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -422,7 +422,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDepthStencilSurface(D3D8Wrapper::IDirect3DSurface8** ppZStencilSurface) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetDepthStencilSurface(D3D8Wrapper::IDirect3DSurface8** ppZStencilSurface)
{ {
LOG("IDirect3DDevice8::GetDepthStencilSurface( " << ppZStencilSurface << " )\n"); LOG("IDirect3DDevice8::GetDepthStencilSurface( " << ppZStencilSurface << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -437,13 +437,13 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::BeginScene() STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::BeginScene()
{ {
LOG("IDirect3DDevice8::BeginScene()\n"); LOG("IDirect3DDevice8::BeginScene() [ " << this << " ]\n");
return m_pDevice->BeginScene(); return m_pDevice->BeginScene();
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::EndScene() STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::EndScene()
{ {
LOG("IDirect3DDevice8::EndScene()\n"); LOG("IDirect3DDevice8::EndScene() [ " << this << " ]\n");
return m_pDevice->EndScene(); return m_pDevice->EndScene();
} }
@ -455,7 +455,7 @@ extern "C"
{ {
LOG("{ " << pRects->x1 << " , " << pRects->y1 << " , " << pRects->x2 << " , " << pRects->y2 << " }") LOG("{ " << pRects->x1 << " , " << pRects->y1 << " , " << pRects->x2 << " , " << pRects->y2 << " }")
} }
LOG(" , " << Flags << " , " << Color << " , " << Z << " , " << Stencil << " )\n"); LOG(" , " << Flags << " , " << Color << " , " << Z << " , " << Stencil << " ) [ " << this << " ]\n");
#endif #endif
return m_pDevice->Clear(Count,pRects,Flags,Color,Z,Stencil); return m_pDevice->Clear(Count,pRects,Flags,Color,Z,Stencil);
@ -463,25 +463,25 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetTransform(D3D8Base::D3DTRANSFORMSTATETYPE State,CONST D3D8Base::D3DMATRIX* pMatrix) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetTransform(D3D8Base::D3DTRANSFORMSTATETYPE State,CONST D3D8Base::D3DMATRIX* pMatrix)
{ {
LOG("IDirect3DDevice8::SetTransform( " << State << " , " << pMatrix << " )\n"); LOG("IDirect3DDevice8::SetTransform( " << State << " , " << pMatrix << " ) [ " << this << " ]\n");
return m_pDevice->SetTransform(State,pMatrix); return m_pDevice->SetTransform(State,pMatrix);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetTransform(D3D8Base::D3DTRANSFORMSTATETYPE State,D3D8Base::D3DMATRIX* pMatrix) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetTransform(D3D8Base::D3DTRANSFORMSTATETYPE State,D3D8Base::D3DMATRIX* pMatrix)
{ {
LOG("IDirect3DDevice8::GetTransform( " << State << " , " << pMatrix << " )\n"); LOG("IDirect3DDevice8::GetTransform( " << State << " , " << pMatrix << " ) [ " << this << " ]\n");
return m_pDevice->GetTransform(State,pMatrix); return m_pDevice->GetTransform(State,pMatrix);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::MultiplyTransform(D3D8Base::D3DTRANSFORMSTATETYPE foo,CONST D3D8Base::D3DMATRIX* bar) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::MultiplyTransform(D3D8Base::D3DTRANSFORMSTATETYPE foo,CONST D3D8Base::D3DMATRIX* bar)
{ {
LOG("IDirect3DDevice8::MultiplyTransform( " << foo << " , " << bar << " )\n"); LOG("IDirect3DDevice8::MultiplyTransform( " << foo << " , " << bar << " ) [ " << this << " ]\n");
return m_pDevice->MultiplyTransform(foo, bar); return m_pDevice->MultiplyTransform(foo, bar);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetViewport(CONST D3D8Base::D3DVIEWPORT8* pViewport) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetViewport(CONST D3D8Base::D3DVIEWPORT8* pViewport)
{ {
LOG("IDirect3DDevice8::SetViewport( " << pViewport << " )\n"); LOG("IDirect3DDevice8::SetViewport( " << pViewport << " ) [ " << this << " ]\n");
return m_pDevice->SetViewport(pViewport); return m_pDevice->SetViewport(pViewport);
} }
@ -493,122 +493,122 @@ extern "C"
{ {
LOG("{ " << pViewport->X << " , " << pViewport->Y << " , " << pViewport->Width << " , " << pViewport->Height << " , " << pViewport->MinZ << " , " << pViewport->MaxZ << " }"); LOG("{ " << pViewport->X << " , " << pViewport->Y << " , " << pViewport->Width << " , " << pViewport->Height << " , " << pViewport->MinZ << " , " << pViewport->MaxZ << " }");
} }
LOG(" )\n"); LOG(" ) [ " << this << " ]\n");
#endif #endif
return m_pDevice->GetViewport(pViewport); return m_pDevice->GetViewport(pViewport);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetMaterial(CONST D3D8Base::D3DMATERIAL8* pMaterial) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetMaterial(CONST D3D8Base::D3DMATERIAL8* pMaterial)
{ {
LOG("IDirect3DDevice8::SetMaterial( " << pMaterial << " )\n"); LOG("IDirect3DDevice8::SetMaterial( " << pMaterial << " ) [ " << this << " ]\n");
return m_pDevice->SetMaterial(pMaterial); return m_pDevice->SetMaterial(pMaterial);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetMaterial(D3D8Base::D3DMATERIAL8* pMaterial) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetMaterial(D3D8Base::D3DMATERIAL8* pMaterial)
{ {
LOG("IDirect3DDevice8::GetMaterial( " << pMaterial << " )\n"); LOG("IDirect3DDevice8::GetMaterial( " << pMaterial << " ) [ " << this << " ]\n");
return m_pDevice->GetMaterial(pMaterial); return m_pDevice->GetMaterial(pMaterial);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetLight(DWORD Index,CONST D3D8Base::D3DLIGHT8* foo) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetLight(DWORD Index,CONST D3D8Base::D3DLIGHT8* foo)
{ {
LOG("IDirect3DDevice8::SetLight( " << Index << " , " << foo << " )\n"); LOG("IDirect3DDevice8::SetLight( " << Index << " , " << foo << " ) [ " << this << " ]\n");
return m_pDevice->SetLight(Index,foo); return m_pDevice->SetLight(Index,foo);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetLight(DWORD Index,D3D8Base::D3DLIGHT8* foo) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetLight(DWORD Index,D3D8Base::D3DLIGHT8* foo)
{ {
LOG("IDirect3DDevice8::GetLight( " << Index << " , " << foo << " )\n"); LOG("IDirect3DDevice8::GetLight( " << Index << " , " << foo << " ) [ " << this << " ]\n");
return m_pDevice->GetLight(Index,foo); return m_pDevice->GetLight(Index,foo);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::LightEnable(DWORD Index,BOOL Enable) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::LightEnable(DWORD Index,BOOL Enable)
{ {
LOG("IDirect3DDevice8::LightEnable( " << Index << " , " << Enable << " )\n"); LOG("IDirect3DDevice8::LightEnable( " << Index << " , " << Enable << " ) [ " << this << " ]\n");
return m_pDevice->LightEnable(Index,Enable); return m_pDevice->LightEnable(Index,Enable);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetLightEnable(DWORD Index,BOOL* pEnable) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetLightEnable(DWORD Index,BOOL* pEnable)
{ {
LOG("IDirect3DDevice8::GetLightEnable( " << Index << " , " << pEnable << " )\n"); LOG("IDirect3DDevice8::GetLightEnable( " << Index << " , " << pEnable << " ) [ " << this << " ]\n");
return m_pDevice->GetLightEnable(Index,pEnable); return m_pDevice->GetLightEnable(Index,pEnable);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetClipPlane(DWORD Index,CONST float* pPlane) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetClipPlane(DWORD Index,CONST float* pPlane)
{ {
LOG("IDirect3DDevice8::SetClipPlane( " << Index << " , " << pPlane << " )\n"); LOG("IDirect3DDevice8::SetClipPlane( " << Index << " , " << pPlane << " ) [ " << this << " ]\n");
return m_pDevice->SetClipPlane(Index,pPlane); return m_pDevice->SetClipPlane(Index,pPlane);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetClipPlane(DWORD Index,float* pPlane) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetClipPlane(DWORD Index,float* pPlane)
{ {
LOG("IDirect3DDevice8::GetClipPlane( " << Index << " , " << pPlane << " )\n"); LOG("IDirect3DDevice8::GetClipPlane( " << Index << " , " << pPlane << " ) [ " << this << " ]\n");
return m_pDevice->GetClipPlane(Index,pPlane); return m_pDevice->GetClipPlane(Index,pPlane);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetRenderState(D3D8Base::D3DRENDERSTATETYPE State,DWORD Value) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetRenderState(D3D8Base::D3DRENDERSTATETYPE State,DWORD Value)
{ {
LOG("IDirect3DDevice8::SetRenderState( " << State << " , " << Value << " )\n"); LOG("IDirect3DDevice8::SetRenderState( " << State << " , " << Value << " ) [ " << this << " ]\n");
return m_pDevice->SetRenderState(State,Value); return m_pDevice->SetRenderState(State,Value);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetRenderState(D3D8Base::D3DRENDERSTATETYPE State,DWORD* pValue) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetRenderState(D3D8Base::D3DRENDERSTATETYPE State,DWORD* pValue)
{ {
LOG("IDirect3DDevice8::GetRenderState( " << State << " , " << pValue << " )\n"); LOG("IDirect3DDevice8::GetRenderState( " << State << " , " << pValue << " ) [ " << this << " ]\n");
return m_pDevice->GetRenderState(State,pValue); return m_pDevice->GetRenderState(State,pValue);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::BeginStateBlock() STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::BeginStateBlock()
{ {
LOG("IDirect3DDevice8::BeginStateBlock()\n"); LOG("IDirect3DDevice8::BeginStateBlock() [ " << this << " ]\n");
return m_pDevice->BeginStateBlock(); return m_pDevice->BeginStateBlock();
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::EndStateBlock(DWORD* pToken) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::EndStateBlock(DWORD* pToken)
{ {
LOG("IDirect3DDevice8::EndStateBlock( " << pToken << " )\n"); LOG("IDirect3DDevice8::EndStateBlock( " << pToken << " ) [ " << this << " ]\n");
return m_pDevice->EndStateBlock(pToken); return m_pDevice->EndStateBlock(pToken);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ApplyStateBlock(DWORD Token) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ApplyStateBlock(DWORD Token)
{ {
LOG("IDirect3DDevice8::ApplyStateBlock( " << Token << " )\n"); LOG("IDirect3DDevice8::ApplyStateBlock( " << Token << " ) [ " << this << " ]\n");
return m_pDevice->ApplyStateBlock(Token); return m_pDevice->ApplyStateBlock(Token);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CaptureStateBlock(DWORD Token) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CaptureStateBlock(DWORD Token)
{ {
LOG("IDirect3DDevice8::CaptureStateBlock( " << Token << " )\n"); LOG("IDirect3DDevice8::CaptureStateBlock( " << Token << " ) [ " << this << " ]\n");
return m_pDevice->CaptureStateBlock(Token); return m_pDevice->CaptureStateBlock(Token);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeleteStateBlock(DWORD Token) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeleteStateBlock(DWORD Token)
{ {
LOG("IDirect3DDevice8::DeleteStateBlock( " << Token << " )\n"); LOG("IDirect3DDevice8::DeleteStateBlock( " << Token << " ) [ " << this << " ]\n");
return m_pDevice->DeleteStateBlock(Token); return m_pDevice->DeleteStateBlock(Token);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateStateBlock(D3D8Base::D3DSTATEBLOCKTYPE Type,DWORD* pToken) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateStateBlock(D3D8Base::D3DSTATEBLOCKTYPE Type,DWORD* pToken)
{ {
LOG("IDirect3DDevice8::CreateStateBlock( " << Type << " , " << pToken << " )\n"); LOG("IDirect3DDevice8::CreateStateBlock( " << Type << " , " << pToken << " ) [ " << this << " ]\n");
return m_pDevice->CreateStateBlock(Type,pToken); return m_pDevice->CreateStateBlock(Type,pToken);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetClipStatus(CONST D3D8Base::D3DCLIPSTATUS8* pClipStatus) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetClipStatus(CONST D3D8Base::D3DCLIPSTATUS8* pClipStatus)
{ {
LOG("IDirect3DDevice8::SetClipStatus( " << pClipStatus << " )\n"); LOG("IDirect3DDevice8::SetClipStatus( " << pClipStatus << " ) [ " << this << " ]\n");
return m_pDevice->SetClipStatus(pClipStatus); return m_pDevice->SetClipStatus(pClipStatus);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetClipStatus(D3D8Base::D3DCLIPSTATUS8* pClipStatus) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetClipStatus(D3D8Base::D3DCLIPSTATUS8* pClipStatus)
{ {
LOG("IDirect3DDevice8::GetClipStatus( " << pClipStatus << " )\n"); LOG("IDirect3DDevice8::GetClipStatus( " << pClipStatus << " ) [ " << this << " ]\n");
return m_pDevice->GetClipStatus(pClipStatus); return m_pDevice->GetClipStatus(pClipStatus);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetTexture(DWORD Stage,D3D8Wrapper::IDirect3DBaseTexture8** ppTexture) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetTexture(DWORD Stage,D3D8Wrapper::IDirect3DBaseTexture8** ppTexture)
{ {
LOG("IDirect3DDevice8::GetTexture( " << Stage << " , " << ppTexture << " )\n"); LOG("IDirect3DDevice8::GetTexture( " << Stage << " , " << ppTexture << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DBaseTexture8* realD3D = NULL; D3D8Base::IDirect3DBaseTexture8* realD3D = NULL;
@ -623,7 +623,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetTexture(DWORD Stage,D3D8Wrapper::IDirect3DBaseTexture8* pTexture) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetTexture(DWORD Stage,D3D8Wrapper::IDirect3DBaseTexture8* pTexture)
{ {
LOG("IDirect3DDevice8::SetTexture( " << Stage << " , " << pTexture << " )\n"); LOG("IDirect3DDevice8::SetTexture( " << Stage << " , " << pTexture << " ) [ " << this << " ]\n");
if (pTexture == NULL) if (pTexture == NULL)
{ {
@ -637,79 +637,79 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetTextureStageState(DWORD Stage,D3D8Base::D3DTEXTURESTAGESTATETYPE Type,DWORD* pValue) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetTextureStageState(DWORD Stage,D3D8Base::D3DTEXTURESTAGESTATETYPE Type,DWORD* pValue)
{ {
LOG("IDirect3DDevice8::GetTextureStageState( " << Stage << " , " << Type << " , " << pValue << " )\n"); LOG("IDirect3DDevice8::GetTextureStageState( " << Stage << " , " << Type << " , " << pValue << " ) [ " << this << " ]\n");
return m_pDevice->GetTextureStageState(Stage,Type,pValue); return m_pDevice->GetTextureStageState(Stage,Type,pValue);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetTextureStageState(DWORD Stage,D3D8Base::D3DTEXTURESTAGESTATETYPE Type,DWORD Value) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetTextureStageState(DWORD Stage,D3D8Base::D3DTEXTURESTAGESTATETYPE Type,DWORD Value)
{ {
LOG("IDirect3DDevice8::SetTextureStageState( " << Stage << " , " << Type << " , " << Value << " )\n"); LOG("IDirect3DDevice8::SetTextureStageState( " << Stage << " , " << Type << " , " << Value << " ) [ " << this << " ]\n");
return m_pDevice->SetTextureStageState(Stage,Type,Value); return m_pDevice->SetTextureStageState(Stage,Type,Value);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ValidateDevice(DWORD* pNumPasses) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ValidateDevice(DWORD* pNumPasses)
{ {
LOG("IDirect3DDevice8::ValidateDevice( " << pNumPasses << " )\n"); LOG("IDirect3DDevice8::ValidateDevice( " << pNumPasses << " ) [ " << this << " ]\n");
return m_pDevice->ValidateDevice(pNumPasses); return m_pDevice->ValidateDevice(pNumPasses);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetInfo(DWORD DevInfoID,void* pDevInfoStruct,DWORD DevInfoStructSize) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetInfo(DWORD DevInfoID,void* pDevInfoStruct,DWORD DevInfoStructSize)
{ {
LOG("IDirect3DDevice8::GetInfo( " << DevInfoID << " , " << pDevInfoStruct << " , " << DevInfoStructSize << " )\n"); LOG("IDirect3DDevice8::GetInfo( " << DevInfoID << " , " << pDevInfoStruct << " , " << DevInfoStructSize << " ) [ " << this << " ]\n");
return m_pDevice->GetInfo(DevInfoID,pDevInfoStruct,DevInfoStructSize); return m_pDevice->GetInfo(DevInfoID,pDevInfoStruct,DevInfoStructSize);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetPaletteEntries(UINT PaletteNumber,CONST PALETTEENTRY* pEntries) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetPaletteEntries(UINT PaletteNumber,CONST PALETTEENTRY* pEntries)
{ {
LOG("IDirect3DDevice8::SetPaletteEntries( " << PaletteNumber << " , " << pEntries << " )\n"); LOG("IDirect3DDevice8::SetPaletteEntries( " << PaletteNumber << " , " << pEntries << " ) [ " << this << " ]\n");
return m_pDevice->SetPaletteEntries(PaletteNumber,pEntries); return m_pDevice->SetPaletteEntries(PaletteNumber,pEntries);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPaletteEntries(UINT PaletteNumber,PALETTEENTRY* pEntries) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPaletteEntries(UINT PaletteNumber,PALETTEENTRY* pEntries)
{ {
LOG("IDirect3DDevice8::GetPaletteEntries( " << PaletteNumber << " , " << pEntries << " )\n"); LOG("IDirect3DDevice8::GetPaletteEntries( " << PaletteNumber << " , " << pEntries << " ) [ " << this << " ]\n");
return m_pDevice->GetPaletteEntries(PaletteNumber,pEntries); return m_pDevice->GetPaletteEntries(PaletteNumber,pEntries);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetCurrentTexturePalette(UINT PaletteNumber) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetCurrentTexturePalette(UINT PaletteNumber)
{ {
LOG("IDirect3DDevice8::SetCurrentTexturePalette( " << PaletteNumber << " )\n"); LOG("IDirect3DDevice8::SetCurrentTexturePalette( " << PaletteNumber << " ) [ " << this << " ]\n");
return m_pDevice->SetCurrentTexturePalette(PaletteNumber); return m_pDevice->SetCurrentTexturePalette(PaletteNumber);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetCurrentTexturePalette(UINT *PaletteNumber) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetCurrentTexturePalette(UINT *PaletteNumber)
{ {
LOG("IDirect3DDevice8::GetCurrentTexturePalette( " << PaletteNumber << " )\n"); LOG("IDirect3DDevice8::GetCurrentTexturePalette( " << PaletteNumber << " ) [ " << this << " ]\n");
return m_pDevice->GetCurrentTexturePalette(PaletteNumber); return m_pDevice->GetCurrentTexturePalette(PaletteNumber);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawPrimitive(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT StartVertex,UINT PrimitiveCount) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawPrimitive(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT StartVertex,UINT PrimitiveCount)
{ {
LOG("IDirect3DDevice8::DrawPrimitive( " << PrimitiveType << " , " << StartVertex << " , " << PrimitiveCount << " )\n"); LOG("IDirect3DDevice8::DrawPrimitive( " << PrimitiveType << " , " << StartVertex << " , " << PrimitiveCount << " ) [ " << this << " ]\n");
return m_pDevice->DrawPrimitive(PrimitiveType,StartVertex,PrimitiveCount); return m_pDevice->DrawPrimitive(PrimitiveType,StartVertex,PrimitiveCount);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawIndexedPrimitive(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawIndexedPrimitive(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount)
{ {
LOG("IDirect3DDevice8::DrawIndexedPrimitive( " << PrimitiveType << " , " << minIndex << " , " << NumVertices << " , " << startIndex << " , " << primCount << " )\n"); LOG("IDirect3DDevice8::DrawIndexedPrimitive( " << PrimitiveType << " , " << minIndex << " , " << NumVertices << " , " << startIndex << " , " << primCount << " ) [ " << this << " ]\n");
return m_pDevice->DrawIndexedPrimitive(PrimitiveType,minIndex,NumVertices,startIndex,primCount); return m_pDevice->DrawIndexedPrimitive(PrimitiveType,minIndex,NumVertices,startIndex,primCount);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawPrimitiveUP(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawPrimitiveUP(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride)
{ {
LOG("IDirect3DDevice8::DrawPrimitiveUP( " << PrimitiveType << " , " << PrimitiveCount << " , " << pVertexStreamZeroData << " , " << VertexStreamZeroStride << " )\n"); LOG("IDirect3DDevice8::DrawPrimitiveUP( " << PrimitiveType << " , " << PrimitiveCount << " , " << pVertexStreamZeroData << " , " << VertexStreamZeroStride << " ) [ " << this << " ]\n");
return m_pDevice->DrawPrimitiveUP(PrimitiveType,PrimitiveCount,pVertexStreamZeroData,VertexStreamZeroStride); return m_pDevice->DrawPrimitiveUP(PrimitiveType,PrimitiveCount,pVertexStreamZeroData,VertexStreamZeroStride);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawIndexedPrimitiveUP(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertexIndices,UINT PrimitiveCount,CONST void* pIndexData,D3D8Base::D3DFORMAT IndexDataFormat,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawIndexedPrimitiveUP(D3D8Base::D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertexIndices,UINT PrimitiveCount,CONST void* pIndexData,D3D8Base::D3DFORMAT IndexDataFormat,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride)
{ {
LOG("IDirect3DDevice8::DrawIndexedPrimitiveUP( " << PrimitiveType << " , " << MinVertexIndex << " , " << NumVertexIndices << " , " << PrimitiveCount << " , " << pIndexData << " , " << IndexDataFormat << " , " << pVertexStreamZeroData << " , " << VertexStreamZeroStride << " )\n"); LOG("IDirect3DDevice8::DrawIndexedPrimitiveUP( " << PrimitiveType << " , " << MinVertexIndex << " , " << NumVertexIndices << " , " << PrimitiveCount << " , " << pIndexData << " , " << IndexDataFormat << " , " << pVertexStreamZeroData << " , " << VertexStreamZeroStride << " ) [ " << this << " ]\n");
return m_pDevice->DrawIndexedPrimitiveUP(PrimitiveType,MinVertexIndex,NumVertexIndices,PrimitiveCount,pIndexData,IndexDataFormat,pVertexStreamZeroData,VertexStreamZeroStride); return m_pDevice->DrawIndexedPrimitiveUP(PrimitiveType,MinVertexIndex,NumVertexIndices,PrimitiveCount,pIndexData,IndexDataFormat,pVertexStreamZeroData,VertexStreamZeroStride);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ProcessVertices(UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,D3D8Wrapper::IDirect3DVertexBuffer8* pDestBuffer,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::ProcessVertices(UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,D3D8Wrapper::IDirect3DVertexBuffer8* pDestBuffer,DWORD Flags)
{ {
LOG("IDirect3DDevice8::ProcessVertices( " << SrcStartIndex << " , " << DestIndex << " , " << VertexCount << " , " << pDestBuffer << " , " << Flags << " )\n"); LOG("IDirect3DDevice8::ProcessVertices( " << SrcStartIndex << " , " << DestIndex << " , " << VertexCount << " , " << pDestBuffer << " , " << Flags << " ) [ " << this << " ]\n");
if (pDestBuffer == NULL) if (pDestBuffer == NULL)
{ {
return m_pDevice->ProcessVertices(SrcStartIndex,DestIndex,VertexCount,NULL,Flags); return m_pDevice->ProcessVertices(SrcStartIndex,DestIndex,VertexCount,NULL,Flags);
@ -722,55 +722,55 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateVertexShader(CONST DWORD* pDeclaration,CONST DWORD* pFunction,DWORD* pHandle,DWORD Usage) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreateVertexShader(CONST DWORD* pDeclaration,CONST DWORD* pFunction,DWORD* pHandle,DWORD Usage)
{ {
LOG("IDirect3DDevice8::CreateVertexShader( " << pDeclaration << " , " << pFunction << " , " << pHandle << " , " << Usage << " )\n"); LOG("IDirect3DDevice8::CreateVertexShader( " << pDeclaration << " , " << pFunction << " , " << pHandle << " , " << Usage << " ) [ " << this << " ]\n");
return m_pDevice->CreateVertexShader(pDeclaration,pFunction,pHandle,Usage); return m_pDevice->CreateVertexShader(pDeclaration,pFunction,pHandle,Usage);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetVertexShader(DWORD Handle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetVertexShader(DWORD Handle)
{ {
LOG("IDirect3DDevice8::SetVertexShader( " << Handle << " )\n"); LOG("IDirect3DDevice8::SetVertexShader( " << Handle << " ) [ " << this << " ]\n");
return m_pDevice->SetVertexShader(Handle); return m_pDevice->SetVertexShader(Handle);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShader(DWORD* pHandle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShader(DWORD* pHandle)
{ {
LOG("IDirect3DDevice8::GetVertexShader( " << pHandle << " )\n"); LOG("IDirect3DDevice8::GetVertexShader( " << pHandle << " ) [ " << this << " ]\n");
return m_pDevice->GetVertexShader(pHandle); return m_pDevice->GetVertexShader(pHandle);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeleteVertexShader(DWORD Handle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeleteVertexShader(DWORD Handle)
{ {
LOG("IDirect3DDevice8::DeleteVertexShader( " << Handle << " )\n"); LOG("IDirect3DDevice8::DeleteVertexShader( " << Handle << " ) [ " << this << " ]\n");
return m_pDevice->DeleteVertexShader(Handle); return m_pDevice->DeleteVertexShader(Handle);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetVertexShaderConstant(DWORD Register,CONST void* pConstantData,DWORD ConstantCount) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetVertexShaderConstant(DWORD Register,CONST void* pConstantData,DWORD ConstantCount)
{ {
LOG("IDirect3DDevice8::SetVertexShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " )\n"); LOG("IDirect3DDevice8::SetVertexShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " ) [ " << this << " ]\n");
return m_pDevice->SetVertexShaderConstant(Register,pConstantData,ConstantCount); return m_pDevice->SetVertexShaderConstant(Register,pConstantData,ConstantCount);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShaderConstant(DWORD Register,void* pConstantData,DWORD ConstantCount) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShaderConstant(DWORD Register,void* pConstantData,DWORD ConstantCount)
{ {
LOG("IDirect3DDevice8::GetVertexShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " )\n"); LOG("IDirect3DDevice8::GetVertexShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " ) [ " << this << " ]\n");
return m_pDevice->GetVertexShaderConstant(Register,pConstantData,ConstantCount); return m_pDevice->GetVertexShaderConstant(Register,pConstantData,ConstantCount);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShaderDeclaration(DWORD Handle,void* pData,DWORD* pSizeOfData) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShaderDeclaration(DWORD Handle,void* pData,DWORD* pSizeOfData)
{ {
LOG("IDirect3DDevice8::GetVertexShaderDeclaration( " << Handle << " , " << pData << " , " << pSizeOfData << " )\n"); LOG("IDirect3DDevice8::GetVertexShaderDeclaration( " << Handle << " , " << pData << " , " << pSizeOfData << " ) [ " << this << " ]\n");
return m_pDevice->GetVertexShaderDeclaration(Handle,pData,pSizeOfData); return m_pDevice->GetVertexShaderDeclaration(Handle,pData,pSizeOfData);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShaderFunction(DWORD Handle,void* pData,DWORD* pSizeOfData) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetVertexShaderFunction(DWORD Handle,void* pData,DWORD* pSizeOfData)
{ {
LOG("IDirect3DDevice8::GetVertexShaderFunction( " << Handle << " , " << pData << " , " << pSizeOfData << " )\n"); LOG("IDirect3DDevice8::GetVertexShaderFunction( " << Handle << " , " << pData << " , " << pSizeOfData << " ) [ " << this << " ]\n");
return m_pDevice->GetVertexShaderFunction(Handle,pData,pSizeOfData); return m_pDevice->GetVertexShaderFunction(Handle,pData,pSizeOfData);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetStreamSource(UINT StreamNumber,D3D8Wrapper::IDirect3DVertexBuffer8* pStreamData,UINT Stride) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetStreamSource(UINT StreamNumber,D3D8Wrapper::IDirect3DVertexBuffer8* pStreamData,UINT Stride)
{ {
LOG("IDirect3DDevice8::SetStreamSource( " << StreamNumber << " , " << pStreamData << " , " << Stride << " )\n"); LOG("IDirect3DDevice8::SetStreamSource( " << StreamNumber << " , " << pStreamData << " , " << Stride << " ) [ " << this << " ]\n");
if (pStreamData == NULL) if (pStreamData == NULL)
{ {
return m_pDevice->SetStreamSource(StreamNumber,NULL,Stride); return m_pDevice->SetStreamSource(StreamNumber,NULL,Stride);
@ -783,7 +783,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetStreamSource(UINT StreamNumber,D3D8Wrapper::IDirect3DVertexBuffer8** ppStreamData,UINT* pStride) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetStreamSource(UINT StreamNumber,D3D8Wrapper::IDirect3DVertexBuffer8** ppStreamData,UINT* pStride)
{ {
LOG("IDirect3DDevice8::GetStreamSource( " << StreamNumber << " , " << ppStreamData << " , " << pStride << " )\n"); LOG("IDirect3DDevice8::GetStreamSource( " << StreamNumber << " , " << ppStreamData << " , " << pStride << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DVertexBuffer8* realD3D = NULL; D3D8Base::IDirect3DVertexBuffer8* realD3D = NULL;
@ -798,7 +798,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetIndices(D3D8Wrapper::IDirect3DIndexBuffer8* pIndexData,UINT BaseVertexIndex) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetIndices(D3D8Wrapper::IDirect3DIndexBuffer8* pIndexData,UINT BaseVertexIndex)
{ {
LOG("IDirect3DDevice8::SetIndices( " << pIndexData << " , " << BaseVertexIndex << " )\n"); LOG("IDirect3DDevice8::SetIndices( " << pIndexData << " , " << BaseVertexIndex << " ) [ " << this << " ]\n");
if (pIndexData == NULL) if (pIndexData == NULL)
{ {
return m_pDevice->SetIndices(NULL,BaseVertexIndex); return m_pDevice->SetIndices(NULL,BaseVertexIndex);
@ -811,7 +811,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetIndices(D3D8Wrapper::IDirect3DIndexBuffer8** ppIndexData,UINT* pBaseVertexIndex) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetIndices(D3D8Wrapper::IDirect3DIndexBuffer8** ppIndexData,UINT* pBaseVertexIndex)
{ {
LOG("IDirect3DDevice8::GetIndices( " << ppIndexData << " , " << pBaseVertexIndex << " )\n"); LOG("IDirect3DDevice8::GetIndices( " << ppIndexData << " , " << pBaseVertexIndex << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DIndexBuffer8* realD3D = NULL; D3D8Base::IDirect3DIndexBuffer8* realD3D = NULL;
@ -826,61 +826,61 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreatePixelShader(CONST DWORD* pFunction,DWORD* pHandle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::CreatePixelShader(CONST DWORD* pFunction,DWORD* pHandle)
{ {
LOG("IDirect3DDevice8::CreatePixelShader( " << pFunction << " , " << pHandle << " )\n"); LOG("IDirect3DDevice8::CreatePixelShader( " << pFunction << " , " << pHandle << " ) [ " << this << " ]\n");
return m_pDevice->CreatePixelShader(pFunction,pHandle); return m_pDevice->CreatePixelShader(pFunction,pHandle);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetPixelShader(DWORD Handle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetPixelShader(DWORD Handle)
{ {
LOG("IDirect3DDevice8::SetPixelShader( " << Handle << " )\n"); LOG("IDirect3DDevice8::SetPixelShader( " << Handle << " ) [ " << this << " ]\n");
return m_pDevice->SetPixelShader(Handle); return m_pDevice->SetPixelShader(Handle);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPixelShader(DWORD* pHandle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPixelShader(DWORD* pHandle)
{ {
LOG("IDirect3DDevice8::GetPixelShader( " << pHandle << " )\n"); LOG("IDirect3DDevice8::GetPixelShader( " << pHandle << " ) [ " << this << " ]\n");
return m_pDevice->GetPixelShader(pHandle); return m_pDevice->GetPixelShader(pHandle);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeletePixelShader(DWORD Handle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeletePixelShader(DWORD Handle)
{ {
LOG("IDirect3DDevice8::DeletePixelShader( " << Handle << " )\n"); LOG("IDirect3DDevice8::DeletePixelShader( " << Handle << " ) [ " << this << " ]\n");
return m_pDevice->DeletePixelShader(Handle); return m_pDevice->DeletePixelShader(Handle);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetPixelShaderConstant(DWORD Register,CONST void* pConstantData,DWORD ConstantCount) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::SetPixelShaderConstant(DWORD Register,CONST void* pConstantData,DWORD ConstantCount)
{ {
LOG("IDirect3DDevice8::SetPixelShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " )\n"); LOG("IDirect3DDevice8::SetPixelShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " ) [ " << this << " ]\n");
return m_pDevice->SetPixelShaderConstant(Register,pConstantData,ConstantCount); return m_pDevice->SetPixelShaderConstant(Register,pConstantData,ConstantCount);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPixelShaderConstant(DWORD Register,void* pConstantData,DWORD ConstantCount) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPixelShaderConstant(DWORD Register,void* pConstantData,DWORD ConstantCount)
{ {
LOG("IDirect3DDevice8::GetPixelShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " )\n"); LOG("IDirect3DDevice8::GetPixelShaderConstant( " << Register << " , " << pConstantData << " , " << ConstantCount << " ) [ " << this << " ]\n");
return m_pDevice->GetPixelShaderConstant(Register,pConstantData,ConstantCount); return m_pDevice->GetPixelShaderConstant(Register,pConstantData,ConstantCount);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPixelShaderFunction(DWORD Handle,void* pData,DWORD* pSizeOfData) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::GetPixelShaderFunction(DWORD Handle,void* pData,DWORD* pSizeOfData)
{ {
LOG("IDirect3DDevice8::GetPixelShaderFunction( " << Handle << " , " << pData << " , " << pSizeOfData << " )\n"); LOG("IDirect3DDevice8::GetPixelShaderFunction( " << Handle << " , " << pData << " , " << pSizeOfData << " ) [ " << this << " ]\n");
return m_pDevice->GetPixelShaderFunction(Handle,pData,pSizeOfData); return m_pDevice->GetPixelShaderFunction(Handle,pData,pSizeOfData);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawRectPatch(UINT Handle,CONST float* pNumSegs,CONST D3D8Base::D3DRECTPATCH_INFO* pRectPatchInfo) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawRectPatch(UINT Handle,CONST float* pNumSegs,CONST D3D8Base::D3DRECTPATCH_INFO* pRectPatchInfo)
{ {
LOG("IDirect3DDevice8::DrawRectPatch( " << Handle << " , " << pNumSegs << " , " << pRectPatchInfo << " )\n"); LOG("IDirect3DDevice8::DrawRectPatch( " << Handle << " , " << pNumSegs << " , " << pRectPatchInfo << " ) [ " << this << " ]\n");
return m_pDevice->DrawRectPatch(Handle,pNumSegs,pRectPatchInfo); return m_pDevice->DrawRectPatch(Handle,pNumSegs,pRectPatchInfo);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawTriPatch(UINT Handle,CONST float* pNumSegs,CONST D3D8Base::D3DTRIPATCH_INFO* pTriPatchInfo) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DrawTriPatch(UINT Handle,CONST float* pNumSegs,CONST D3D8Base::D3DTRIPATCH_INFO* pTriPatchInfo)
{ {
LOG("IDirect3DDevice8::DrawTriPatch( " << Handle << " , " << pNumSegs << " , " << pTriPatchInfo << " )\n"); LOG("IDirect3DDevice8::DrawTriPatch( " << Handle << " , " << pNumSegs << " , " << pTriPatchInfo << " ) [ " << this << " ]\n");
return m_pDevice->DrawTriPatch(Handle,pNumSegs,pTriPatchInfo); return m_pDevice->DrawTriPatch(Handle,pNumSegs,pTriPatchInfo);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeletePatch(UINT Handle) STDMETHODIMP D3D8Wrapper::IDirect3DDevice8::DeletePatch(UINT Handle)
{ {
LOG("IDirect3DDevice8::DeletePatch( " << Handle << " )\n"); LOG("IDirect3DDevice8::DeletePatch( " << Handle << " ) [ " << this << " ]\n");
return m_pDevice->DeletePatch(Handle); return m_pDevice->DeletePatch(Handle);
} }
} }

6
libmupen64plus/D3D8Interceptor/Direct3DIndexBuffer8Functions.cpp
View File

@ -12,19 +12,19 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DIndexBuffer8::Lock(UINT OffsetToLock,UINT SizeToLock,BYTE** ppbData,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DIndexBuffer8::Lock(UINT OffsetToLock,UINT SizeToLock,BYTE** ppbData,DWORD Flags)
{ {
LOG("IDirect3DIndexBuffer8::Lock( " << OffsetToLock << " , " << SizeToLock << " , " << ppbData << " , " << Flags << " )\n"); LOG("IDirect3DIndexBuffer8::Lock( " << OffsetToLock << " , " << SizeToLock << " , " << ppbData << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->Lock(OffsetToLock,SizeToLock,ppbData,Flags); return m_pD3D->Lock(OffsetToLock,SizeToLock,ppbData,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DIndexBuffer8::Unlock() STDMETHODIMP D3D8Wrapper::IDirect3DIndexBuffer8::Unlock()
{ {
LOG("IDirect3DIndexBuffer8::Unlock()\n"); LOG("IDirect3DIndexBuffer8::Unlock() [ " << this << " ]\n");
return m_pD3D->Unlock(); return m_pD3D->Unlock();
} }
STDMETHODIMP D3D8Wrapper::IDirect3DIndexBuffer8::GetDesc(D3D8Base::D3DINDEXBUFFER_DESC *pDesc) STDMETHODIMP D3D8Wrapper::IDirect3DIndexBuffer8::GetDesc(D3D8Base::D3DINDEXBUFFER_DESC *pDesc)
{ {
LOG("IDirect3DIndexBuffer8::GetDesc( " << pDesc << " )\n"); LOG("IDirect3DIndexBuffer8::GetDesc( " << pDesc << " ) [ " << this << " ]\n");
return m_pD3D->GetDesc(pDesc); return m_pD3D->GetDesc(pDesc);
} }
} }

18
libmupen64plus/D3D8Interceptor/Direct3DResource8Functions.cpp
View File

@ -29,7 +29,7 @@ extern "C"
STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DResource8::Release(THIS) STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DResource8::Release(THIS)
{ {
LOG("IDirect3DResource8::Release( " << this << " )\n"); LOG("IDirect3DResource8::Release() [ " << this << " ]\n");
m_pUnk->Release(); m_pUnk->Release();
ULONG ulRef = --m_ulRef; ULONG ulRef = --m_ulRef;
@ -44,7 +44,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DResource8::GetDevice(D3D8Wrapper::IDirect3DDevice8** ppDevice) STDMETHODIMP D3D8Wrapper::IDirect3DResource8::GetDevice(D3D8Wrapper::IDirect3DDevice8** ppDevice)
{ {
LOG("IDirect3DResource8::GetDevice( " << ppDevice << " )\n"); LOG("IDirect3DResource8::GetDevice( " << ppDevice << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DDevice8* realD3D = NULL; D3D8Base::IDirect3DDevice8* realD3D = NULL;
HRESULT hr = m_pD3D->GetDevice(&realD3D); HRESULT hr = m_pD3D->GetDevice(&realD3D);
@ -58,43 +58,43 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DResource8::SetPrivateData(REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DResource8::SetPrivateData(REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags)
{ {
LOG("IDirect3DResource8::SetPrivateData( " << &refguid << " , " << pData << " , " << SizeOfData << " , " << Flags << " )\n"); LOG("IDirect3DResource8::SetPrivateData( " << &refguid << " , " << pData << " , " << SizeOfData << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->SetPrivateData(refguid,pData,SizeOfData,Flags); return m_pD3D->SetPrivateData(refguid,pData,SizeOfData,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DResource8::GetPrivateData(REFGUID refguid,void* pData,DWORD* pSizeOfData) STDMETHODIMP D3D8Wrapper::IDirect3DResource8::GetPrivateData(REFGUID refguid,void* pData,DWORD* pSizeOfData)
{ {
LOG("IDirect3DResource8::GetPrivateData( " << &refguid << " , " << pData << " , " << pSizeOfData << " )\n"); LOG("IDirect3DResource8::GetPrivateData( " << &refguid << " , " << pData << " , " << pSizeOfData << " ) [ " << this << " ]\n");
return m_pD3D->GetPrivateData(refguid,pData,pSizeOfData); return m_pD3D->GetPrivateData(refguid,pData,pSizeOfData);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DResource8::FreePrivateData(REFGUID refguid) STDMETHODIMP D3D8Wrapper::IDirect3DResource8::FreePrivateData(REFGUID refguid)
{ {
LOG("IDirect3DResource8::FreePrivateData( " << &refguid << " )\n"); LOG("IDirect3DResource8::FreePrivateData( " << &refguid << " ) [ " << this << " ]\n");
return m_pD3D->FreePrivateData(refguid); return m_pD3D->FreePrivateData(refguid);
} }
STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DResource8::SetPriority(DWORD PriorityNew) STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DResource8::SetPriority(DWORD PriorityNew)
{ {
LOG("IDirect3DResource8::SetPriority( " << PriorityNew << " )\n"); LOG("IDirect3DResource8::SetPriority( " << PriorityNew << " ) [ " << this << " ]\n");
return m_pD3D->SetPriority(PriorityNew); return m_pD3D->SetPriority(PriorityNew);
} }
STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DResource8::GetPriority() STDMETHODIMP_(DWORD) D3D8Wrapper::IDirect3DResource8::GetPriority()
{ {
LOG("IDirect3DResource8::GetPriority()\n"); LOG("IDirect3DResource8::GetPriority() [ " << this << " ]\n");
return m_pD3D->GetPriority(); return m_pD3D->GetPriority();
} }
STDMETHODIMP_(void) D3D8Wrapper::IDirect3DResource8::PreLoad() STDMETHODIMP_(void) D3D8Wrapper::IDirect3DResource8::PreLoad()
{ {
LOG("IDirect3DResource8::PreLoad()\n"); LOG("IDirect3DResource8::PreLoad() [ " << this << " ]\n");
return m_pD3D->PreLoad(); return m_pD3D->PreLoad();
} }
STDMETHODIMP_(D3D8Base::D3DRESOURCETYPE) D3D8Wrapper::IDirect3DResource8::GetType() STDMETHODIMP_(D3D8Base::D3DRESOURCETYPE) D3D8Wrapper::IDirect3DResource8::GetType()
{ {
LOG("IDirect3DResource8::GetType()\n"); LOG("IDirect3DResource8::GetType() [ " << this << " ]\n");
return m_pD3D->GetType(); return m_pD3D->GetType();
} }
} }

18
libmupen64plus/D3D8Interceptor/Direct3DSurface8Functions.cpp
View File

@ -29,7 +29,7 @@ extern "C"
STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DSurface8::Release(THIS) STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DSurface8::Release(THIS)
{ {
LOG("IDirect3DSurface8::Release( " << this << " )\n"); LOG("IDirect3DSurface8::Release() [ " << this << " ]\n");
m_pUnk->Release(); m_pUnk->Release();
ULONG ulRef = --m_ulRef; ULONG ulRef = --m_ulRef;
@ -44,7 +44,7 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetDevice(D3D8Wrapper::IDirect3DDevice8** ppDevice) STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetDevice(D3D8Wrapper::IDirect3DDevice8** ppDevice)
{ {
LOG("IDirect3DSurface8::GetDevice( " << ppDevice << " )\n"); LOG("IDirect3DSurface8::GetDevice( " << ppDevice << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DDevice8* realD3D = NULL; D3D8Base::IDirect3DDevice8* realD3D = NULL;
@ -59,31 +59,31 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::SetPrivateData(REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::SetPrivateData(REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags)
{ {
LOG("IDirect3DSurface8::SetPrivateData( " << &refguid << " , " << pData << " , " << SizeOfData << " , " << Flags << " )\n"); LOG("IDirect3DSurface8::SetPrivateData( " << &refguid << " , " << pData << " , " << SizeOfData << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->SetPrivateData(refguid,pData,SizeOfData,Flags); return m_pD3D->SetPrivateData(refguid,pData,SizeOfData,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetPrivateData(REFGUID refguid,void* pData,DWORD* pSizeOfData) STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetPrivateData(REFGUID refguid,void* pData,DWORD* pSizeOfData)
{ {
LOG("IDirect3DSurface8::GetPrivateData( " << &refguid << " , " << pData << " , " << pSizeOfData << " )\n"); LOG("IDirect3DSurface8::GetPrivateData( " << &refguid << " , " << pData << " , " << pSizeOfData << " ) [ " << this << " ]\n");
return m_pD3D->GetPrivateData(refguid,pData,pSizeOfData); return m_pD3D->GetPrivateData(refguid,pData,pSizeOfData);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::FreePrivateData(REFGUID refguid) STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::FreePrivateData(REFGUID refguid)
{ {
LOG("IDirect3DSurface8::FreePrivateData( " << &refguid << " )\n"); LOG("IDirect3DSurface8::FreePrivateData( " << &refguid << " ) [ " << this << " ]\n");
return m_pD3D->FreePrivateData(refguid); return m_pD3D->FreePrivateData(refguid);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetContainer(REFIID riid,void** ppContainer) STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetContainer(REFIID riid,void** ppContainer)
{ {
LOG("IDirect3DSurface8::GetContainer( " << &riid << " , " << ppContainer << " )\n"); LOG("IDirect3DSurface8::GetContainer( " << &riid << " , " << ppContainer << " ) [ " << this << " ]\n");
return m_pD3D->GetContainer(riid,ppContainer); return m_pD3D->GetContainer(riid,ppContainer);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetDesc(D3D8Base::D3DSURFACE_DESC *pDesc) STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::GetDesc(D3D8Base::D3DSURFACE_DESC *pDesc)
{ {
LOG("IDirect3DSurface8::GetDesc( " << pDesc << " )\n"); LOG("IDirect3DSurface8::GetDesc( " << pDesc << " ) [ " << this << " ]\n");
return m_pD3D->GetDesc(pDesc); return m_pD3D->GetDesc(pDesc);
} }
@ -95,14 +95,14 @@ extern "C"
{ {
LOG("{ " << pRect->left << " , " << pRect->top << " , " << pRect->right << " , " << pRect->bottom << " }"); LOG("{ " << pRect->left << " , " << pRect->top << " , " << pRect->right << " , " << pRect->bottom << " }");
} }
LOG(" , " << Flags << " )\n"); LOG(" , " << Flags << " ) [ " << this << " ]\n");
#endif #endif
return m_pD3D->LockRect(pLockedRect,pRect,Flags); return m_pD3D->LockRect(pLockedRect,pRect,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::UnlockRect() STDMETHODIMP D3D8Wrapper::IDirect3DSurface8::UnlockRect()
{ {
LOG("IDirect3DSurface8::UnlockRect()\n"); LOG("IDirect3DSurface8::UnlockRect() [ " << this << " ]\n");
return m_pD3D->UnlockRect(); return m_pD3D->UnlockRect();
} }
} }

6
libmupen64plus/D3D8Interceptor/Direct3DSwapChain8Functions.cpp
View File

@ -29,7 +29,7 @@ extern "C"
STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DSwapChain8::Release(THIS) STDMETHODIMP_(ULONG) D3D8Wrapper::IDirect3DSwapChain8::Release(THIS)
{ {
LOG("IDirect3DSwapChain8::Release( " << this << " )\n"); LOG("IDirect3DSwapChain8::Release()n[ " << this << " ]\n");
m_pUnk->Release(); m_pUnk->Release();
ULONG ulRef = --m_ulRef; ULONG ulRef = --m_ulRef;
@ -44,13 +44,13 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DSwapChain8::Present(CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) STDMETHODIMP D3D8Wrapper::IDirect3DSwapChain8::Present(CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion)
{ {
LOG("IDirect3DSwapChain8::Present( " << pSourceRect << " , " << pDestRect << " , " << hDestWindowOverride << " , " << pDirtyRegion << " )\n"); LOG("IDirect3DSwapChain8::Present( " << pSourceRect << " , " << pDestRect << " , " << hDestWindowOverride << " , " << pDirtyRegion << " ) [ " << this << " ]\n");
return m_pD3D->Present(pSourceRect,pDestRect,hDestWindowOverride,pDirtyRegion); return m_pD3D->Present(pSourceRect,pDestRect,hDestWindowOverride,pDirtyRegion);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DSwapChain8::GetBackBuffer(UINT BackBuffer,D3D8Base::D3DBACKBUFFER_TYPE Type,D3D8Wrapper::IDirect3DSurface8** ppBackBuffer) STDMETHODIMP D3D8Wrapper::IDirect3DSwapChain8::GetBackBuffer(UINT BackBuffer,D3D8Base::D3DBACKBUFFER_TYPE Type,D3D8Wrapper::IDirect3DSurface8** ppBackBuffer)
{ {
LOG("IDirect3DSwapChain8::GetBackBuffer( " << BackBuffer << " , " << Type << " , " << ppBackBuffer << " )\n"); LOG("IDirect3DSwapChain8::GetBackBuffer( " << BackBuffer << " , " << Type << " , " << ppBackBuffer << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;

10
libmupen64plus/D3D8Interceptor/Direct3DTexture8Functions.cpp
View File

@ -27,13 +27,13 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::GetLevelDesc(UINT Level,D3D8Base::D3DSURFACE_DESC *pDesc) STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::GetLevelDesc(UINT Level,D3D8Base::D3DSURFACE_DESC *pDesc)
{ {
LOG("IDirect3DTexture8::GetLevelDesc( " << Level << " , " << pDesc << " )\n"); LOG("IDirect3DTexture8::GetLevelDesc( " << Level << " , " << pDesc << " ) [ " << this << " ]\n");
return m_pD3D->GetLevelDesc(Level,pDesc); return m_pD3D->GetLevelDesc(Level,pDesc);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::GetSurfaceLevel(UINT Level,D3D8Wrapper::IDirect3DSurface8** ppSurfaceLevel) STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::GetSurfaceLevel(UINT Level,D3D8Wrapper::IDirect3DSurface8** ppSurfaceLevel)
{ {
LOG("IDirect3DTexture8::GetSurfaceLevel( " << Level << " , " << ppSurfaceLevel << " )\n"); LOG("IDirect3DTexture8::GetSurfaceLevel( " << Level << " , " << ppSurfaceLevel << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DSurface8* realD3D = NULL; D3D8Base::IDirect3DSurface8* realD3D = NULL;
@ -48,19 +48,19 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::LockRect(UINT Level,D3D8Base::D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::LockRect(UINT Level,D3D8Base::D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags)
{ {
LOG("IDirect3DTexture8::LockRect( " << Level << " , " << pLockedRect << " , " << pRect << " , " << Flags << " )\n"); LOG("IDirect3DTexture8::LockRect( " << Level << " , " << pLockedRect << " , " << pRect << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->LockRect(Level,pLockedRect,pRect,Flags); return m_pD3D->LockRect(Level,pLockedRect,pRect,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::UnlockRect(UINT Level) STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::UnlockRect(UINT Level)
{ {
LOG("IDirect3DTexture8::UnlockRect()\n"); LOG("IDirect3DTexture8::UnlockRect() [ " << this << " ]\n");
return m_pD3D->UnlockRect(Level); return m_pD3D->UnlockRect(Level);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::AddDirtyRect(CONST RECT* pDirtyRect) STDMETHODIMP D3D8Wrapper::IDirect3DTexture8::AddDirtyRect(CONST RECT* pDirtyRect)
{ {
LOG("IDirect3DTexture8::AddDirtyRect( " << pDirtyRect << " )\n"); LOG("IDirect3DTexture8::AddDirtyRect( " << pDirtyRect << " ) [ " << this << " ]\n");
return m_pD3D->AddDirtyRect(pDirtyRect); return m_pD3D->AddDirtyRect(pDirtyRect);
} }
} }

6
libmupen64plus/D3D8Interceptor/Direct3DVertexBuffer8Functions.cpp
View File

@ -12,19 +12,19 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DVertexBuffer8::Lock(UINT OffsetToLock,UINT SizeToLock,BYTE** ppbData,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DVertexBuffer8::Lock(UINT OffsetToLock,UINT SizeToLock,BYTE** ppbData,DWORD Flags)
{ {
LOG("IDirect3DVertexBuffer8::Lock( " << OffsetToLock << " , " << SizeToLock << " , " << ppbData << " , " << Flags << " )\n"); LOG("IDirect3DVertexBuffer8::Lock( " << OffsetToLock << " , " << SizeToLock << " , " << ppbData << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->Lock(OffsetToLock,SizeToLock,ppbData,Flags); return m_pD3D->Lock(OffsetToLock,SizeToLock,ppbData,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVertexBuffer8::Unlock() STDMETHODIMP D3D8Wrapper::IDirect3DVertexBuffer8::Unlock()
{ {
LOG("IDirect3DVertexBuffer8::Unlock()\n"); LOG("IDirect3DVertexBuffer8::Unlock() [ " << this << " ]\n");
return m_pD3D->Unlock(); return m_pD3D->Unlock();
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVertexBuffer8::GetDesc(D3D8Base::D3DVERTEXBUFFER_DESC *pDesc) STDMETHODIMP D3D8Wrapper::IDirect3DVertexBuffer8::GetDesc(D3D8Base::D3DVERTEXBUFFER_DESC *pDesc)
{ {
LOG("IDirect3DVertexBuffer8::GetDesc( " << pDesc << " )\n"); LOG("IDirect3DVertexBuffer8::GetDesc( " << pDesc << " ) [ " << this << " ]\n");
return m_pD3D->GetDesc(pDesc); return m_pD3D->GetDesc(pDesc);
} }
} }

14
libmupen64plus/D3D8Interceptor/Direct3DVolume8Functions.cpp
View File

@ -27,43 +27,43 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::SetPrivateData(REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::SetPrivateData(REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags)
{ {
LOG("IDirect3DVolume8::SetPrivateData( " << &refguid << " , " << pData << " , " << SizeOfData << " , " << Flags << " )\n"); LOG("IDirect3DVolume8::SetPrivateData( " << &refguid << " , " << pData << " , " << SizeOfData << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->SetPrivateData(refguid,pData,SizeOfData,Flags); return m_pD3D->SetPrivateData(refguid,pData,SizeOfData,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::GetPrivateData(REFGUID refguid,void* pData,DWORD* pSizeOfData) STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::GetPrivateData(REFGUID refguid,void* pData,DWORD* pSizeOfData)
{ {
LOG("IDirect3DVolume8::GetPrivateData( " << &refguid << " , " << pData << " , " << pSizeOfData << " )\n"); LOG("IDirect3DVolume8::GetPrivateData( " << &refguid << " , " << pData << " , " << pSizeOfData << " ) [ " << this << " ]\n");
return m_pD3D->GetPrivateData(refguid,pData,pSizeOfData); return m_pD3D->GetPrivateData(refguid,pData,pSizeOfData);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::FreePrivateData(REFGUID refguid) STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::FreePrivateData(REFGUID refguid)
{ {
LOG("IDirect3DVolume8::FreePrivateData( " << &refguid << " )\n"); LOG("IDirect3DVolume8::FreePrivateData( " << &refguid << " ) [ " << this << " ]\n");
return m_pD3D->FreePrivateData(refguid); return m_pD3D->FreePrivateData(refguid);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::GetContainer(REFIID riid,void** ppContainer) STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::GetContainer(REFIID riid,void** ppContainer)
{ {
LOG("IDirect3DVolume8::GetContainer( " << &riid << " , " << ppContainer << " )\n"); LOG("IDirect3DVolume8::GetContainer( " << &riid << " , " << ppContainer << " ) [ " << this << " ]\n");
return m_pD3D->GetContainer(riid,ppContainer); return m_pD3D->GetContainer(riid,ppContainer);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::GetDesc(D3D8Base::D3DVOLUME_DESC *pDesc) STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::GetDesc(D3D8Base::D3DVOLUME_DESC *pDesc)
{ {
LOG("IDirect3DVolume8::GetDesc( " << pDesc << " )\n"); LOG("IDirect3DVolume8::GetDesc( " << pDesc << " ) [ " << this << " ]\n");
return m_pD3D->GetDesc(pDesc); return m_pD3D->GetDesc(pDesc);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::LockBox(D3D8Base::D3DLOCKED_BOX * pLockedVolume,CONST D3D8Base::D3DBOX* pBox,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::LockBox(D3D8Base::D3DLOCKED_BOX * pLockedVolume,CONST D3D8Base::D3DBOX* pBox,DWORD Flags)
{ {
LOG("IDirect3DVolume8::LockBox( " << pLockedVolume << " , " << pBox << " , " << Flags << " )\n"); LOG("IDirect3DVolume8::LockBox( " << pLockedVolume << " , " << pBox << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->LockBox(pLockedVolume,pBox,Flags); return m_pD3D->LockBox(pLockedVolume,pBox,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::UnlockBox() STDMETHODIMP D3D8Wrapper::IDirect3DVolume8::UnlockBox()
{ {
LOG("IDirect3DVolume8::UnlockBox()\n"); LOG("IDirect3DVolume8::UnlockBox() [ " << this << " ]\n");
return m_pD3D->UnlockBox(); return m_pD3D->UnlockBox();
} }
} }

10
libmupen64plus/D3D8Interceptor/Direct3DVolumeTexture8Functions.cpp
View File

@ -12,13 +12,13 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::GetLevelDesc(UINT Level,D3D8Base::D3DVOLUME_DESC *pDesc) STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::GetLevelDesc(UINT Level,D3D8Base::D3DVOLUME_DESC *pDesc)
{ {
LOG("IDirect3DVolumeTexture8::GetLevelDesc( " << Level << " , " << pDesc << " )\n"); LOG("IDirect3DVolumeTexture8::GetLevelDesc( " << Level << " , " << pDesc << " ) [ " << this << " ]\n");
return m_pD3D->GetLevelDesc(Level,pDesc); return m_pD3D->GetLevelDesc(Level,pDesc);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::GetVolumeLevel(UINT Level,D3D8Wrapper::IDirect3DVolume8** ppVolumeLevel) STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::GetVolumeLevel(UINT Level,D3D8Wrapper::IDirect3DVolume8** ppVolumeLevel)
{ {
LOG("IDirect3DVolumeTexture8::GetVolumeLevel( " << Level << " , " << ppVolumeLevel << " )\n"); LOG("IDirect3DVolumeTexture8::GetVolumeLevel( " << Level << " , " << ppVolumeLevel << " ) [ " << this << " ]\n");
D3D8Base::IDirect3DVolume8* realD3D = NULL; D3D8Base::IDirect3DVolume8* realD3D = NULL;
@ -33,19 +33,19 @@ extern "C"
STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::LockBox(UINT Level,D3D8Base::D3DLOCKED_BOX* pLockedVolume,CONST D3D8Base::D3DBOX* pBox,DWORD Flags) STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::LockBox(UINT Level,D3D8Base::D3DLOCKED_BOX* pLockedVolume,CONST D3D8Base::D3DBOX* pBox,DWORD Flags)
{ {
LOG("IDirect3DVolumeTexture8::LockBox( " << Level << " , " << pLockedVolume << " , " << pBox << " , " << Flags << " )\n"); LOG("IDirect3DVolumeTexture8::LockBox( " << Level << " , " << pLockedVolume << " , " << pBox << " , " << Flags << " ) [ " << this << " ]\n");
return m_pD3D->LockBox(Level,pLockedVolume,pBox,Flags); return m_pD3D->LockBox(Level,pLockedVolume,pBox,Flags);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::UnlockBox(UINT Level) STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::UnlockBox(UINT Level)
{ {
LOG("IDirect3DVolumeTexture8::UnlockBox( " << Level << " )\n"); LOG("IDirect3DVolumeTexture8::UnlockBox( " << Level << " ) [ " << this << " ]\n");
return m_pD3D->UnlockBox(Level); return m_pD3D->UnlockBox(Level);
} }
STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::AddDirtyBox(CONST D3D8Base::D3DBOX* pDirtyBox) STDMETHODIMP D3D8Wrapper::IDirect3DVolumeTexture8::AddDirtyBox(CONST D3D8Base::D3DBOX* pDirtyBox)
{ {
LOG("IDirect3DVolumeTexture8::AddDirtyBox( " << pDirtyBox << " )\n"); LOG("IDirect3DVolumeTexture8::AddDirtyBox( " << pDirtyBox << " ) [ " << this << " ]\n");
return m_pD3D->AddDirtyBox(pDirtyBox); return m_pD3D->AddDirtyBox(pDirtyBox);
} }
} }

BIN
output/dll/d3d8.dll
View File

Binary file not shown.