Remove patches for GetAdapterModeCount and EnumAdapterModes

If we are just going to return values the Xbox would, why not just let the XDK do it's job
Cxbx-Reloaded · Dec 14, 2016 · efe953b · efe953b
1 parent 90ca700
commit efe953b
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 241 deletions.
diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp
@@ -1691,27 +1691,6 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_SelectVertexShader
     return D3D_OK;
 }
 
-// ******************************************************************
-// * func: EmuIDirect3D8_GetAdapterModeCount
-// ******************************************************************
-UINT WINAPI XTL::EmuIDirect3D8_GetAdapterModeCount
-(
-    UINT                        Adapter
-)
-{
-
-
-    DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3D8_GetAdapterModeCount\n"
-           "(\n"
-           "   Adapter                   : 0x%.08X\n"
-           ");\n",
-           GetCurrentThreadId(), Adapter);
-
-	// NOTE: completely ignoring the Adapter parameter
-
-    return XboxResolutions.size();
-}
-
 // ******************************************************************
 // * func: EmuIDirect3D8_GetAdapterDisplayMode
 // ******************************************************************
@@ -1749,48 +1728,6 @@ HRESULT WINAPI XTL::EmuIDirect3D8_GetAdapterDisplayMode
 	return hRet;
 }
 
-// ******************************************************************
-// * func: EmuIDirect3D8_EnumAdapterModes
-// ******************************************************************
-HRESULT WINAPI XTL::EmuIDirect3D8_EnumAdapterModes
-(
-    UINT                        Adapter,
-    UINT                        Mode,
-    X_D3DDISPLAYMODE           *pMode
-)
-{
-
-
-    DbgPrintf("EmuD3D8 (0x%X): EmuIDirect3D8_EnumAdapterModes\n"
-           "(\n"
-           "   Adapter                   : 0x%.08X\n"
-           "   Mode                      : 0x%.08X\n"
-           "   pMode                     : 0x%.08X\n"
-           ");\n",
-           GetCurrentThreadId(), Adapter, Mode, pMode);
-
-    HRESULT hRet;
-
-	// NOTE: completely ignoring the Adapter parameter
-	if (Mode >= XboxResolutions.size())
-	{
-		hRet = D3DERR_INVALIDCALL;
-	}
-	else
-	{
-		pMode->Width = XboxResolutions[Mode].W;
-		pMode->Height = XboxResolutions[Mode].H;
-		pMode->RefreshRate = 60;
-		pMode->Format = XboxResolutions[Mode].F;
-		// D3DPRESENTFLAG_FIELD | D3DPRESENTFLAG_INTERLACED | D3DPRESENTFLAG_LOCKABLE_BACKBUFFER
-		pMode->Flags = 0x000000A1;
-
-		hRet = D3D_OK;
-	}
-
-	return hRet;
-}
-
 // ******************************************************************
 // * func: EmuIDirect3D8_KickOffAndWaitForIdle
 // ******************************************************************

diff --git a/src/CxbxKrnl/EmuD3D8.h b/src/CxbxKrnl/EmuD3D8.h
@@ -176,16 +176,6 @@ HRESULT WINAPI EmuIDirect3D8_GetAdapterDisplayMode
     X_D3DDISPLAYMODE           *pMode
 );
 
-// ******************************************************************
-// * func: EmuIDirect3D8_EnumAdapterModes
-// ******************************************************************
-HRESULT WINAPI EmuIDirect3D8_EnumAdapterModes
-(
-    UINT                        Adapter,
-    UINT                        Mode,
-    X_D3DDISPLAYMODE           *pMode
-);
-
 // ******************************************************************
 // * func: EmuIDirect3D8_KickOffAndWaitForIdle
 // ******************************************************************

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
@@ -5964,24 +5964,6 @@ OOVPATable D3D8_1_0_3925[] =
         "EmuIDirect3DDevice8_BlockOnFence"
         #endif
     },
-	// Direct3D_EnumAdapterModes
-	{
-		(OOVPA*)&Direct3D_EnumAdapterModes_1_0_3925,
-		XTL::EmuIDirect3D8_EnumAdapterModes,
-
-		#ifdef _DEBUG_TRACE
-		"EmuIDirect3D8_EnumAdapterModes"
-		#endif
-	},
-	// Direct3D_GetAdapterModeCount
-	{
-		(OOVPA*)&Direct3D_GetAdapterModeCount_1_0_3925,
-		XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-		#ifdef _DEBUG_TRACE
-		"EmuIDirect3D8_GetAdapterModeCount"
-		#endif
-	},
 	// IDirect3DDevice8::Reset
     {
         (OOVPA*)&D3DDevice_Reset_1_0_3925,

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
@@ -2373,26 +2373,6 @@ OOVPATable D3D8_1_0_4134[] =
         "EmuIDirect3D8_CheckDeviceFormat"
         #endif
     },
-    // IDirect3D8::GetAdapterModeCount
-    {
-        (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4134,
-
-        XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_GetAdapterModeCount"
-        #endif
-    },
-	// IDirect3D8::EnumAdapterModes
-    {
-        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4134,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
-    },
     // IDirect3DDevice8::SetRenderState_TexCoordIndex
     {
         (OOVPA*)&IDirect3DDevice8_SetTextureState_TexCoordIndex_1_0_4134,

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
@@ -2400,16 +2400,6 @@ OOVPATable D3D8_1_0_4361[] =
         "EmuIDirect3D8_CheckDeviceFormat"
         #endif
     },
-    // IDirect3D8::GetAdapterModeCount
-    {
-        (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4361,
-
-        XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_GetAdapterModeCount"
-        #endif
-    },
     // IDirect3D8::GetAdapterDisplayMode
     {
         (OOVPA*)&IDirect3D8_GetAdapterDisplayMode_1_0_4361,
@@ -2420,16 +2410,6 @@ OOVPATable D3D8_1_0_4361[] =
         "EmuIDirect3D8_GetAdapterDisplayMode"
         #endif
     },
-    // IDirect3D8::EnumAdapterModes
-    {
-        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
-    },
     // IDirect3DDevice8::LoadVertexShader (* unchanged since 4034 *)
     {
         (OOVPA*)&IDirect3DDevice8_LoadVertexShader_1_0_4034,

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
@@ -932,16 +932,6 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3D8_CreateDevice"
         #endif
     },
-    // IDirect3D8::GetAdapterModeCount (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4361,
-
-        XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_GetAdapterModeCount"
-        #endif
-    },
     // IDirect3D8::CheckDeviceFormat (* unchanged since 4361 *)
     {
         (OOVPA*)&IDirect3D8_CheckDeviceFormat_1_0_4361,
@@ -952,16 +942,6 @@ OOVPATable D3D8_1_0_4432[] =
         "EmuIDirect3D8_CheckDeviceFormat"
         #endif
     },    
-    // IDirect3D8::EnumAdapterModes (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
-    },
     // IDirect3DDevice8::SetRenderTarget (* unchanged since 4134 *)
     {
         (OOVPA*)&IDirect3DDevice8_SetRenderTarget_1_0_4134,

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
@@ -4340,16 +4340,6 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3DDevice8_GetVisibilityTestResult"
         #endif
     },
-    // IDirect3D8::GetAdapterModeCount (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4361,
-
-        XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_GetAdapterModeCount"
-        #endif
-    },
     // IDirect3D8::GetAdapterDisplayMode
     {
         (OOVPA*)&IDirect3D8_GetAdapterDisplayMode_1_0_4627,
@@ -4360,16 +4350,6 @@ OOVPATable D3D8_1_0_4627[] =
         "EmuIDirect3D8_GetAdapterDisplayMode"
         #endif
     },
-    // IDirect3D8::EnumAdapterModes (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
-    },
     // IDirect3D8::KickOffAndWaitForIdle
     {
         (OOVPA*)&IDirect3D8_KickOffAndWaitForIdle_1_0_4627,

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
@@ -3552,36 +3552,6 @@ OOVPATable D3D8_1_0_5233[] =
 		"EmuIDirect3DDevice8_SetRenderState_MultiSampleMask"
 		#endif
 	},
-	// IDirect3D8::GetAdapterModeCount (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4361,
-
-        XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_GetAdapterModeCount"
-        #endif
-    },
-	// Direct3D_EnumAdapterModes
-	{
-        (OOVPA*)&Direct3D_EnumAdapterModes_1_0_5233,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
-    },
-    // IDirect3D8::EnumAdapterModes (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
-    },    
 	// IDirect3DDevice8::SetVertexData4ub (* unchanged since 4361 *)
     {
         (OOVPA*)&D3DDevice_SetVertexData4ub_1_0_4361,

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
@@ -3119,26 +3119,6 @@ OOVPATable D3D8_1_0_5558[] =
 		"EmuIDirect3DDevice8_CreateIndexBuffer"
 		#endif
 	},
-	// IDirect3D8::GetAdapterModeCount (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4361,
-
-        XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_GetAdapterModeCount"
-        #endif
-    },
-	// IDirect3D8::EnumAdapterModes (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
-    },
 	// D3DDevice_SetVerticalBlankCallback
     {
         (OOVPA*)&D3DDevice_SetVerticalBlankCallback_1_0_5558,

diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
@@ -3355,26 +3355,6 @@ OOVPATable D3D8_1_0_5849[] =
         #ifdef _DEBUG_TRACE
 		"EmuIDirect3DDevice8_SetRenderTargetFast"
         #endif
-    },
-	// IDirect3D8::GetAdapterModeCount (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_GetAdapterModeCount_1_0_4361,
-
-        XTL::EmuIDirect3D8_GetAdapterModeCount,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_GetAdapterModeCount"
-        #endif
-    },
-	// IDirect3D8::EnumAdapterModes (* unchanged since 4361 *)
-    {
-        (OOVPA*)&IDirect3D8_EnumAdapterModes_1_0_4361,
-
-        XTL::EmuIDirect3D8_EnumAdapterModes,
-
-        #ifdef _DEBUG_TRACE
-        "EmuIDirect3D8_EnumAdapterModes"
-        #endif
     },
 	// D3DDevice_SetDepthClipPlanes
 	{