Skip to content

Commit ec1c19a

Browse files
author
Spacebrain
committed
Removed *really* useless functions from xD3D9-Null
1 parent 5d81cdd commit ec1c19a

15 files changed

+269
-361
lines changed

‎src/xrD3D9-Null/IDirect3D9.cpp‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ULONG xrIDirect3D9::AddRef(void)
1919
{
2020
APIDEBUG("xrIDirect3D9::AddRef");
2121
m_refCount++;
22-
return ULONG_Proc(m_refCount);
22+
return m_refCount;
2323
}
2424

2525
ULONG xrIDirect3D9::Release(void)
@@ -29,9 +29,9 @@ ULONG xrIDirect3D9::Release(void)
2929
if (m_refCount < 0)
3030
{
3131
delete this;
32-
return ULONG_Proc(-1);
32+
return -1;
3333
}
34-
return ULONG_Proc(m_refCount);
34+
return m_refCount;
3535
}
3636

3737
HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj)
@@ -41,20 +41,20 @@ HRESULT xrIDirect3D9::QueryInterface(const IID &iid, void FAR* FAR* ppvObj)
4141
{
4242
*ppvObj = this;
4343
AddRef();
44-
return HRESULT_Proc(NOERROR);
44+
return NOERROR;
4545
}
46-
return HRESULT_Proc(E_NOINTERFACE);
46+
return E_NOINTERFACE;
4747
}
4848

4949
HRESULT xrIDirect3D9::RegisterSoftwareDevice(void* pInitializeFunction)
5050
{
5151
APIDEBUG("xrIDirect3D9::RegisterSoftwareDevice");
52-
return HRESULT_Proc(S_OK);
52+
return S_OK;
5353
};
5454
UINT xrIDirect3D9::GetAdapterCount()
5555
{
5656
APIDEBUG("xrIDirect3D9::GetAdapterCount");
57-
return ULONG_Proc(1);
57+
return 1;
5858
};
5959

6060
HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_IDENTIFIER9* pIdentifier)
@@ -63,56 +63,56 @@ HRESULT xrIDirect3D9::GetAdapterIdentifier(UINT Adapter,DWORD Flags,D3DADAPTER_I
6363
sprintf_s(pIdentifier->Driver, "Default Driver");
6464
sprintf_s(pIdentifier->Description, "Default X-Ray Dedicated Adapter");
6565
sprintf_s(pIdentifier->DeviceName, "Dedicated");
66-
return HRESULT_Proc(S_OK);
66+
return S_OK;
6767
};
6868
UINT xrIDirect3D9::GetAdapterModeCount( UINT Adapter,D3DFORMAT Format)
6969
{
7070
APIDEBUG("xrIDirect3D9::GetAdapterModeCount");
71-
return ULONG_Proc(1);
71+
return 1;
7272
};
7373

7474
HRESULT xrIDirect3D9::EnumAdapterModes(UINT Adapter,D3DFORMAT Format,UINT Mode,D3DDISPLAYMODE* pMode)
7575
{
7676
APIDEBUG("xrIDirect3D9::EnumAdapterModes");
77-
return HRESULT_Proc(S_OK);
77+
return S_OK;
7878
};
7979
HRESULT xrIDirect3D9::GetAdapterDisplayMode( UINT Adapter,D3DDISPLAYMODE* pMode)
8080
{
8181
APIDEBUG("xrIDirect3D9::GetAdapterDisplayMode");
8282
pMode->Format = D3DFMT_A8R8G8B8;
83-
return HRESULT_Proc(S_OK);
83+
return S_OK;
8484
};
8585
HRESULT xrIDirect3D9::CheckDeviceType( UINT Adapter,D3DDEVTYPE DevType,D3DFORMAT AdapterFormat,D3DFORMAT BackBufferFormat,BOOL bWindowed)
8686
{
8787
APIDEBUG("xrIDirect3D9::CheckDeviceType");
88-
return HRESULT_Proc(S_OK);
88+
return S_OK;
8989
};
9090
HRESULT xrIDirect3D9::CheckDeviceFormat( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,DWORD Usage,D3DRESOURCETYPE RType,D3DFORMAT CheckFormat)
9191
{
9292
APIDEBUG("xrIDirect3D9::CheckDeviceFormat");
93-
return HRESULT_Proc(S_OK);
93+
return S_OK;
9494
};
9595
HRESULT xrIDirect3D9::CheckDeviceMultiSampleType( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SurfaceFormat,BOOL Windowed,D3DMULTISAMPLE_TYPE MultiSampleType,DWORD* pQualityLevels)
9696
{
9797
APIDEBUG("xrIDirect3D9::CheckDeviceMultiSampleType");
98-
return HRESULT_Proc(S_OK);
98+
return S_OK;
9999
};
100100
HRESULT xrIDirect3D9::CheckDepthStencilMatch( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT AdapterFormat,D3DFORMAT RenderTargetFormat,D3DFORMAT DepthStencilFormat)
101101
{
102102
APIDEBUG("xrIDirect3D9::CheckDepthStencilMatch");
103-
return HRESULT_Proc(S_OK);
103+
return S_OK;
104104
};
105105
HRESULT xrIDirect3D9::CheckDeviceFormatConversion( UINT Adapter,D3DDEVTYPE DeviceType,D3DFORMAT SourceFormat,D3DFORMAT TargetFormat)
106106
{
107107
APIDEBUG("xrIDirect3D9::CheckDeviceFormatConversion");
108-
return HRESULT_Proc(S_OK);
108+
return S_OK;
109109
};
110110
HRESULT xrIDirect3D9::GetDeviceCaps( UINT Adapter,D3DDEVTYPE DeviceType,D3DCAPS9* pCaps)
111111
{
112112
APIDEBUG("xrIDirect3D9::GetDeviceCaps");
113113
if (pCaps)
114114
ZeroMemory(pCaps,sizeof(D3DCAPS9));
115-
return HRESULT_Proc(S_OK);
115+
return S_OK;
116116
};
117117
HMONITOR xrIDirect3D9::GetAdapterMonitor( UINT Adapter)
118118
{
@@ -126,19 +126,5 @@ HRESULT xrIDirect3D9::CreateDevice (UINT Adapter,D3DDEVTYPE DeviceType,HWND hFoc
126126
*ppReturnedDeviceInterface = NULL;
127127
xrIDirect3DDevice9* I = new xrIDirect3DDevice9(this, pPresentationParameters);
128128
*ppReturnedDeviceInterface = I;
129-
return HRESULT_Proc(S_OK);
129+
return S_OK;
130130
};
131-
//-------------------------------------------------------------------
132-
/*
133-
HRESULT xrIDirect3D9::HRESULT_Proc(HRESULT ret)
134-
{
135-
return ret;
136-
}
137-
138-
ULONG xrIDirect3D9::ULONG_Proc(ULONG ret)
139-
{
140-
return ret;
141-
}
142-
*/
143-
144-

‎src/xrD3D9-Null/IDirect3DCubeTexture9.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ HRESULT xrIDirect3DCubeTexture9::QueryInterface( REFIID riid, void** ppvObj)
2929
{
3030
*ppvObj = this;
3131
AddRef();
32-
return HRESULT_Proc(NOERROR);
32+
return NOERROR;
3333
}
34-
return HRESULT_Proc(E_NOINTERFACE);
34+
return E_NOINTERFACE;
3535
}
3636

3737
ULONG xrIDirect3DCubeTexture9::AddRef()
3838
{
3939
APIDEBUG("xrIDirect3DCubeTexture9::AddRef");
4040
m_refCount++;
41-
return ULONG_Proc(m_refCount);
41+
return m_refCount;
4242
}
4343

4444
ULONG xrIDirect3DCubeTexture9::Release()
@@ -48,9 +48,9 @@ ULONG xrIDirect3DCubeTexture9::Release()
4848
if (m_refCount < 0)
4949
{
5050
delete this;
51-
return ULONG_Proc(-1);
51+
return -1;
5252
}
53-
return ULONG_Proc(m_refCount);
53+
return m_refCount;
5454
}
5555

5656
/*** IDirect3DBaseTexture9 methods ***/
@@ -59,21 +59,21 @@ HRESULT xrIDirect3DCubeTexture9::GetDevice( IDirect3DDevice9** ppDevice)
5959
APIDEBUG("xrIDirect3DCubeTexture9::GetDevice");
6060
m_pIDirect3DDevice9->AddRef();
6161
*ppDevice = m_pIDirect3DDevice9;
62-
return HRESULT_Proc(S_OK);
62+
return S_OK;
6363
}
64-
HRESULT xrIDirect3DCubeTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::SetPrivateData"); return HRESULT_Proc(S_OK); };
65-
HRESULT xrIDirect3DCubeTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DCubeTexture9::GetPrivateData"); return HRESULT_Proc(S_OK); };
66-
HRESULT xrIDirect3DCubeTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DCubeTexture9::FreePrivateData"); return HRESULT_Proc(S_OK); };
67-
DWORD xrIDirect3DCubeTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return DWORD_Proc(old); };
68-
DWORD xrIDirect3DCubeTexture9::GetPriority () { APIDEBUG("xrIDirect3DCubeTexture9::GetPriority"); return DWORD_Proc(Priority); };
69-
void xrIDirect3DCubeTexture9::PreLoad () { APIDEBUG("xrIDirect3DCubeTexture9::PreLoad"); return VOID_proc(); };
64+
HRESULT xrIDirect3DCubeTexture9::SetPrivateData ( REFGUID refguid,CONST void* pData,DWORD SizeOfData,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::SetPrivateData"); return S_OK; };
65+
HRESULT xrIDirect3DCubeTexture9::GetPrivateData ( REFGUID refguid,void* pData,DWORD* pSizeOfData) { APIDEBUG("xrIDirect3DCubeTexture9::GetPrivateData"); return S_OK; };
66+
HRESULT xrIDirect3DCubeTexture9::FreePrivateData ( REFGUID refguid) { APIDEBUG("xrIDirect3DCubeTexture9::FreePrivateData"); return S_OK; };
67+
DWORD xrIDirect3DCubeTexture9::SetPriority ( DWORD PriorityNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetPriority"); DWORD old = Priority; Priority = PriorityNew; return old; };
68+
DWORD xrIDirect3DCubeTexture9::GetPriority () { APIDEBUG("xrIDirect3DCubeTexture9::GetPriority"); return Priority; };
69+
void xrIDirect3DCubeTexture9::PreLoad () { APIDEBUG("xrIDirect3DCubeTexture9::PreLoad"); };
7070
D3DRESOURCETYPE xrIDirect3DCubeTexture9::GetType () { APIDEBUG("xrIDirect3DCubeTexture9::GetType"); return D3DRTYPE_TEXTURE; };
71-
DWORD xrIDirect3DCubeTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return DWORD_Proc(old); };
72-
DWORD xrIDirect3DCubeTexture9::GetLOD () { APIDEBUG("xrIDirect3DCubeTexture9::GetLOD"); return DWORD_Proc(LOD); };
73-
DWORD xrIDirect3DCubeTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DCubeTexture9::GetLevelCount"); return DWORD_Proc(Levels); };
74-
HRESULT xrIDirect3DCubeTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DCubeTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return HRESULT_Proc(S_OK); };
75-
D3DTEXTUREFILTERTYPE xrIDirect3DCubeTexture9::GetAutoGenFilterType () { APIDEBUG("xrIDirect3DCubeTexture9::GetAutoGenFilterType"); return D3DTEXTUREFILTERTYPE(FilterType); };
76-
void xrIDirect3DCubeTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DCubeTexture9::GenerateMipSubLevels"); return VOID_proc(); };
71+
DWORD xrIDirect3DCubeTexture9::SetLOD ( DWORD LODNew) { APIDEBUG("xrIDirect3DCubeTexture9::SetLOD"); DWORD old = LOD; LOD = LODNew; return old; };
72+
DWORD xrIDirect3DCubeTexture9::GetLOD () { APIDEBUG("xrIDirect3DCubeTexture9::GetLOD"); return LOD; };
73+
DWORD xrIDirect3DCubeTexture9::GetLevelCount () { APIDEBUG("xrIDirect3DCubeTexture9::GetLevelCount"); return Levels; };
74+
HRESULT xrIDirect3DCubeTexture9::SetAutoGenFilterType ( D3DTEXTUREFILTERTYPE iFilterType) { APIDEBUG("xrIDirect3DCubeTexture9::SetAutoGenFilterType"); FilterType = iFilterType; return S_OK; };
75+
D3DTEXTUREFILTERTYPE xrIDirect3DCubeTexture9::GetAutoGenFilterType () { APIDEBUG("xrIDirect3DCubeTexture9::GetAutoGenFilterType"); return FilterType; };
76+
void xrIDirect3DCubeTexture9::GenerateMipSubLevels () { APIDEBUG("xrIDirect3DCubeTexture9::GenerateMipSubLevels"); };
7777

7878
HRESULT xrIDirect3DCubeTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC *pDesc)
7979
{
@@ -89,7 +89,7 @@ HRESULT xrIDirect3DCubeTexture9::GetLevelDesc ( UINT Level,D3DSURFACE_DESC
8989
pDesc->Width = Width;
9090
pDesc->Height = Height;
9191

92-
return HRESULT_Proc(S_OK);
92+
return S_OK;
9393
};
9494

9595
HRESULT xrIDirect3DCubeTexture9::GetCubeMapSurface( D3DCUBEMAP_FACES FaceType,UINT Level,IDirect3DSurface9** ppCubeMapSurface)
@@ -100,8 +100,8 @@ HRESULT xrIDirect3DCubeTexture9::GetCubeMapSurface( D3DCUBEMAP_FACES FaceTyp
100100
xrIDirect3DSurface9* I = new xrIDirect3DSurface9(m_pIDirect3DDevice9, Width,Height,Format,D3DMULTISAMPLE_TYPE(0),0);
101101
*ppCubeMapSurface = I;
102102

103-
return HRESULT_Proc(S_OK);
103+
return S_OK;
104104
};
105-
HRESULT xrIDirect3DCubeTexture9::LockRect ( D3DCUBEMAP_FACES FaceType, UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::LockRect"); return HRESULT_Proc(S_OK); };
106-
HRESULT xrIDirect3DCubeTexture9::UnlockRect ( D3DCUBEMAP_FACES FaceType, UINT Level) { APIDEBUG("xrIDirect3DCubeTexture9::UnlockRect"); return HRESULT_Proc(S_OK); };
107-
HRESULT xrIDirect3DCubeTexture9::AddDirtyRect ( D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DCubeTexture9::AddDirtyRect"); return HRESULT_Proc(S_OK); };
105+
HRESULT xrIDirect3DCubeTexture9::LockRect ( D3DCUBEMAP_FACES FaceType, UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { APIDEBUG("xrIDirect3DCubeTexture9::LockRect"); return S_OK; };
106+
HRESULT xrIDirect3DCubeTexture9::UnlockRect ( D3DCUBEMAP_FACES FaceType, UINT Level) { APIDEBUG("xrIDirect3DCubeTexture9::UnlockRect"); return S_OK; };
107+
HRESULT xrIDirect3DCubeTexture9::AddDirtyRect ( D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { APIDEBUG("xrIDirect3DCubeTexture9::AddDirtyRect"); return S_OK; };

0 commit comments

Comments
 (0)