dx9 test, programs compile, don't launch yet

Author: githubawn

CMakeLists.txt

@@ -33,6 +33,10 @@ endif()
 # Top level project, doesn't really affect anything.
 project(genzh LANGUAGES C CXX)
 
+if(WIN32)
+    add_definitions(-D_WIN32_WINNT=0x0601)
+endif()
+
 # This file handles extra settings wanted/needed for different compilers.
 include(cmake/compilers.cmake)
 
@@ -52,7 +56,7 @@ endif()
 if((WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows") AND ${CMAKE_SIZEOF_VOID_P} EQUAL 4)
     include(cmake/miles.cmake)
     include(cmake/bink.cmake)
-    include(cmake/dx8.cmake)
+    include(cmake/DX9.cmake)
 endif()
 
 # Define a dummy stlport target when not on VC6.

Core/GameEngine/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(GAMEENGINE_SRC
+set(GAMEENGINE_SRC
 #    Include/Common/AcademyStats.h
 #    Include/Common/ActionManager.h
     Include/Common/AddonCompat.h
@@ -1195,7 +1195,7 @@ target_link_libraries(corei_gameengine_public INTERFACE
     core_compression
     core_browserdispatch
     #core_wwvegas
-    d3d8lib
+    d3d9lib
     gamespy::gamespy
     stlport
 )

Core/GameEngine/Include/GameClient/Mouse.h

@@ -1,4 +1,4 @@
-/*
+/*
 **	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
@@ -255,7 +255,7 @@ class Mouse : public SubsystemInterface
 		RM_WINDOWS=0,	//default Windows cursor - very fast.
 		RM_W3D,				//W3D model tied to frame rate.
 		RM_POLYGON,		//alpha blended polygon tied to frame rate.
-		RM_DX8,			//hardware cursor independent of frame rate.
+		RM_DX9,			//hardware cursor independent of frame rate.
 
 		RM_MAX
 	};

Core/GameEngine/Source/Common/System/Debug.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 **	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
@@ -74,7 +74,7 @@
 #endif
 
 // Horrible reference, but we really, really need to know if we are windowed.
-extern bool DX8Wrapper_IsWindowed;
+extern bool DX9Wrapper_IsWindowed;
 extern HWND ApplicationHWnd;
 
 extern const char *gAppPrefix; /// So WB can have a different log file name.
@@ -151,7 +151,7 @@ static void doStackDump();
 // ----------------------------------------------------------------------------
 inline Bool ignoringAsserts()
 {
-	if (!DX8Wrapper_IsWindowed)
+	if (!DX9Wrapper_IsWindowed)
 		return true;
 	if (TheGlobalData && TheGlobalData->m_headless)
 		return true;
@@ -749,7 +749,7 @@ void ReleaseCrash(const char *reason)
 {
 	/// do additional reporting on the crash, if possible
 
-	if (!DX8Wrapper_IsWindowed) {
+	if (!DX9Wrapper_IsWindowed) {
 		if (ApplicationHWnd) {
 			ShowWindow(ApplicationHWnd, SW_HIDE);
 		}
@@ -799,7 +799,7 @@ void ReleaseCrash(const char *reason)
 		theReleaseCrashLogFile = nullptr;
 	}
 
-	if (!DX8Wrapper_IsWindowed) {
+	if (!DX9Wrapper_IsWindowed) {
 		if (ApplicationHWnd) {
 			ShowWindow(ApplicationHWnd, SW_HIDE);
 		}
@@ -841,7 +841,7 @@ void ReleaseCrashLocalized(const AsciiString& p, const AsciiString& m)
 
 	/// do additional reporting on the crash, if possible
 
-	if (!DX8Wrapper_IsWindowed) {
+	if (!DX9Wrapper_IsWindowed) {
 		if (ApplicationHWnd) {
 			ShowWindow(ApplicationHWnd, SW_HIDE);
 		}

Core/GameEngine/Source/GameClient/Input/Mouse.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 **	Command & Conquer Generals Zero Hour(tm)
 **	Copyright 2025 Electronic Arts Inc.
 **
@@ -57,7 +57,7 @@ const char *const Mouse::RedrawModeName[] = {
 	"Mouse:Windows",
 	"Mouse:W3D",
 	"Mouse:Poly",
-	"Mouse:DX8",
+	"Mouse:DX9",
 };
 
 const char *const Mouse::CursorCaptureBlockReasonNames[] = {

Core/GameEngineDevice/CMakeLists.txt

@@ -223,7 +223,9 @@ target_link_libraries(corei_gameenginedevice_private INTERFACE
 target_link_libraries(corei_gameenginedevice_public INTERFACE
     binkstub
     corei_gameengine_public
-    d3d8lib
+    d3d9lib
+    dinput8
+    dxguid
     milesstub
 )
 

Core/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h

@@ -79,24 +79,24 @@ typedef struct {
 #endif
 
 #define VERTEX_FORMAT VertexFormatXYZDUV2
-#define DX8_VERTEX_FORMAT DX8_FVF_XYZDUV2
+#define DX9_VERTEX_FORMAT DX9_FVF_XYZDUV2
 
 /// Custom render object that draws the heightmap and handles intersection tests.
 /**
 Custom W3D render object that's used to process the terrain.  It handles
 virtually everything to do with the terrain, including: drawing, lighting,
 scorchmarks and intersection tests.
 */
-class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHook, public Snapshot
+class BaseHeightMapRenderObjClass : public RenderObjClass, public DX9_CleanupHook, public Snapshot
 {
 
 public:
 
 	BaseHeightMapRenderObjClass();
 	virtual ~BaseHeightMapRenderObjClass() override;
 
-	// DX8_CleanupHook methods
-	virtual void ReleaseResources() override;	///< Release all dx8 resources so the device can be reset.
+	// DX9_CleanupHook methods
+	virtual void ReleaseResources() override;	///< Release all DX9 resources so the device can be reset.
 	virtual void ReAcquireResources() override;  ///< Reacquire all resources after device reset.
 
 
@@ -243,8 +243,8 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo
 					MAX_SCORCH_MARKS=500,
 					SCORCH_MARKS_IN_TEXTURE=9,
 					SCORCH_PER_ROW = 3};
-	DX8VertexBufferClass	*m_vertexScorch;	///<Scorch vertex buffer.
-	DX8IndexBufferClass			*m_indexScorch;	///<indices defining a triangles for the scorch drawing.
+	DX9VertexBufferClass	*m_vertexScorch;	///<Scorch vertex buffer.
+	DX9IndexBufferClass			*m_indexScorch;	///<indices defining a triangles for the scorch drawing.
 	TextureClass *m_scorchTexture;	///<Scorch mark texture
 	Int			m_curNumScorchVertices;	 ///<number of vertices used in m_vertexScorch.
 	Int			m_curNumScorchIndices;	 ///<number of indices used in m_indexScorch.

Core/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h

@@ -52,8 +52,8 @@ class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass
 	FlatHeightMapRenderObjClass();
 	virtual ~FlatHeightMapRenderObjClass() override;
 
-	// DX8_CleanupHook methods
-	virtual void ReleaseResources() override;	///< Release all dx8 resources so the device can be reset.
+	// DX9_CleanupHook methods
+	virtual void ReleaseResources() override;	///< Release all DX9 resources so the device can be reset.
 	virtual void ReAcquireResources() override;  ///< Reacquire all resources after device reset.
 
 

Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h

@@ -59,8 +59,8 @@ class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass
 	HeightMapRenderObjClass();
 	virtual ~HeightMapRenderObjClass() override;
 
-	// DX8_CleanupHook methods
-	virtual void ReleaseResources() override;	///< Release all dx8 resources so the device can be reset.
+	// DX9_CleanupHook methods
+	virtual void ReleaseResources() override;	///< Release all DX9 resources so the device can be reset.
 	virtual void ReAcquireResources() override;  ///< Reacquire all resources after device reset.
 
 
@@ -89,27 +89,27 @@ class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass
 	Int m_numExtraBlendTiles;		///<number of blend tiles in m_extraBlendTilePositions.
 	Int	m_numVisibleExtraBlendTiles; ///<number rendered last frame.
 	Int m_extraBlendTilePositionsSize; //<total size of array including unused memory.
-	DX8VertexBufferClass **m_vertexBufferTiles; ///<collection of smaller vertex buffers that make up 1 heightmap
+	DX9VertexBufferClass **m_vertexBufferTiles; ///<collection of smaller vertex buffers that make up 1 heightmap
 	VERTEX_FORMAT *m_vertexBufferBackup; ///< In memory copy of the vertex buffer data for quick update of dynamic lighting.
 	Int m_originX; ///<  Origin point in the grid.  Slides around.
 	Int m_originY; ///< Origin point in the grid.  Slides around.
-	DX8IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in a VB tile.
+	DX9IndexBufferClass			*m_indexBuffer;	///<indices defining triangles in a VB tile.
 	Int	m_numVBTilesX;	///<dimensions of array containing all the vertex buffers
 	Int	m_numVBTilesY;	///<dimensions of array containing all the vertex buffers
 	Int m_numVertexBufferTiles;	///<number of vertex buffers needed to store this heightmap
 	Int	m_numBlockColumnsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
 	Int	m_numBlockRowsInLastVB;///<a VB tile may be partially filled, this indicates how many 2x2 vertex blocks are filled.
 
-	DX8VertexBufferClass *getVertexBufferTile(Int x, Int y);
+	DX9VertexBufferClass *getVertexBufferTile(Int x, Int y);
 	VERTEX_FORMAT *getVertexBufferBackup(Int x, Int y);
 	UnsignedInt doTheDynamicLight(VERTEX_FORMAT *vb, VERTEX_FORMAT *vbMirror, Vector3*light, Vector3*normal, W3DDynamicLight *pLights[], Int numLights);
 	Int getXWithOrigin(Int x);
 	Int getYWithOrigin(Int x);
 	///update vertex diffuse color for dynamic lights inside given rectangle
-	Int updateVBForLight(DX8VertexBufferClass *pVB, VERTEX_FORMAT *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
-	Int updateVBForLightOptimized(DX8VertexBufferClass	*pVB, VERTEX_FORMAT *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
+	Int updateVBForLight(DX9VertexBufferClass *pVB, VERTEX_FORMAT *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
+	Int updateVBForLightOptimized(DX9VertexBufferClass	*pVB, VERTEX_FORMAT *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, W3DDynamicLight *pLights[], Int numLights);
 	///update vertex buffer vertices inside given rectangle
-	Int updateVB(DX8VertexBufferClass	*pVB, VERTEX_FORMAT *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
+	Int updateVB(DX9VertexBufferClass	*pVB, VERTEX_FORMAT *data, Int x0, Int y0, Int x1, Int y1, Int originX, Int originY, WorldHeightMap *pMap, RefRenderObjListIterator *pLightsIterator);
 	///update vertex buffers associated with the given rectangle
 	void initDestAlphaLUT();	///<initialize water depth LUT stored in m_destAlphaTexture
 	void renderTerrainPass(CameraClass *pCamera);	///< renders additional terrain pass.

Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h

@@ -42,6 +42,9 @@ enum ChipsetType CPP_11(: Int);
 enum CpuType CPP_11(: Int);
 enum GraphicsVenderID CPP_11(: Int);
 
+struct IDirect3DPixelShader9;
+struct IDirect3DVertexShader9;
+
 class TextureClass;	///forward reference
 /** System for managing complex rendering settings which are either not handled by
 	WW3D2 or need custom paths depending on the video card.  This system will determine
@@ -94,7 +97,7 @@ class W3DShaderManager
 	///Return last activated shader.
 	static ShaderTypes getCurrentShader() {return m_currentShader;}
 	/// Loads a .vso file and creates a vertex shader for it
-	static HRESULT LoadAndCreateD3DShader(const char* strFilePath, const DWORD* pDeclaration, DWORD Usage, Bool ShaderType, DWORD* pHandle);
+	static HRESULT LoadAndCreateD3DShader(const char* strFilePath, const struct _D3DVERTEXELEMENT9* pDeclaration, DWORD Usage, Bool ShaderType, void** pHandle);
 
 	static Bool testMinimumRequirements(ChipsetType *videoChipType, CpuType *cpuType, Int *cpuFreq, MemValueType *numRAM, Real *intBenchIndex, Real *floatBenchIndex, Real *memBenchIndex);
 	static StaticGameLODLevel getGPUPerformanceIndex();
@@ -108,8 +111,8 @@ class W3DShaderManager
 	// Support routines for filter methods.
 	static Bool canRenderToTexture() { return (m_oldRenderSurface && m_newRenderSurface);}
 	static void startRenderToTexture(); ///< Sets render target to texture.
-	static IDirect3DTexture8 * endRenderToTexture(); ///< Ends render to texture, & returns texture.
-	static IDirect3DTexture8 * getRenderTexture();	///< returns last used render target texture
+	static IDirect3DTexture9 * endRenderToTexture(); ///< Ends render to texture, & returns texture.
+	static IDirect3DTexture9 * getRenderTexture();	///< returns last used render target texture
 	static Bool isRenderingToTexture() {return m_renderingToTexture; }
 	static void drawViewport(Int color);	///<draws 2 triangles covering the current tactical viewport
 
@@ -125,10 +128,10 @@ class W3DShaderManager
 	static FilterTypes m_currentFilter; ///< Last filter that was set.
 	// Info for a render to texture surface for special effects.
 	static Bool m_renderingToTexture;
-	static IDirect3DSurface8 *m_oldRenderSurface;	///<previous render target
-	static IDirect3DTexture8 *m_renderTexture;		///<texture into which rendering will be redirected.
-	static IDirect3DSurface8 *m_newRenderSurface;	///<new render target inside m_renderTexture
-	static IDirect3DSurface8 *m_oldDepthSurface;	///<previous depth buffer surface
+	static IDirect3DSurface9 *m_oldRenderSurface;	///<previous render target
+	static IDirect3DTexture9 *m_renderTexture;		///<texture into which rendering will be redirected.
+	static IDirect3DSurface9 *m_newRenderSurface;	///<new render target inside m_renderTexture
+	static IDirect3DSurface9 *m_oldDepthSurface;	///<previous depth buffer surface
 
 
 };
@@ -187,7 +190,7 @@ class ScreenMotionBlurFilter : public W3DFilterInterface
 ///converts viewport to black & white.
 class ScreenBWFilter : public W3DFilterInterface
 {
-	DWORD	m_dwBWPixelShader;		///<D3D handle to pixel shader which tints texture to black & white.
+	IDirect3DPixelShader9*	m_dwBWPixelShader;		///<D3D handle to pixel shader which tints texture to black & white.
 public:
 	virtual Int init() override;			///<perform any one time initialization and validation
 	virtual Int shutdown() override;		///<release resources used by shader