mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match some names/values (#545)

Browse Source 
* Match some names/values

* Fix mingw warning as error
This commit is contained in:
Nathan M Gilbert
2024-02-09 18:40:52 -05:00
committed by GitHub
parent f1f4bd14c6
commit 84af3e2158
8 changed files with 233 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
LEGO1/mxdirectx/mxdirect3d.h
View File

@@ -35,7 +35,7 @@ private:
class MxDeviceEnumerate;
struct MxDriver;
struct MxDevice;
struct Direct3DDeviceInfo;
// VTABLE: LEGO1 0x100db800
// SIZE 0x894
@@ -58,14 +58,17 @@ public:
void Destroy() override; // vtable+0x08
void DestroyButNotDirectDraw() override; // vtable+0x0c
BOOL CreateIDirect3D();
BOOL D3DSetMode();
DWORD GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice);
BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
inline MxAssignedDevice* AssignedDevice() { return this->m_assignedDevice; }
inline IDirect3D2* Direct3D() { return this->m_pDirect3d; }
inline IDirect3DDevice2* Direct3DDevice() { return this->m_pDirect3dDevice; }
inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; }
inline IDirect3D2* GetDirect3D() { return this->m_pDirect3d; }
inline IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, Direct3DDeviceInfo* p_device);
protected:
BOOL D3DCreate();
BOOL D3DSetMode();
int ZBufferDepth(MxAssignedDevice* p_assignedDevice);
// SYNTHETIC: LEGO1 0x1009b120
// MxDirect3D::`scalar deleting destructor'
@@ -74,16 +77,16 @@ private:
MxAssignedDevice* m_assignedDevice; // 0x880
IDirect3D2* m_pDirect3d; // 0x884
IDirect3DDevice2* m_pDirect3dDevice; // 0x888
BOOL m_unk0x88c; // 0x88c
BOOL m_bTexturesDisabled; // 0x88c
undefined4 m_unk0x890; // 0x890
};
#endif
// SIZE 0x1a4
struct MxDevice {
MxDevice() {}
~MxDevice();
MxDevice(
struct Direct3DDeviceInfo {
Direct3DDeviceInfo() {}
~Direct3DDeviceInfo();
Direct3DDeviceInfo(
LPGUID p_guid,
LPSTR p_deviceDesc,
LPSTR p_deviceName,
@@ -91,7 +94,7 @@ struct MxDevice {
LPD3DDEVICEDESC p_HELDesc
);
void Init(
void Initialize(
LPGUID p_guid,
LPSTR p_deviceDesc,
LPSTR p_deviceName,
@@ -105,8 +108,8 @@ struct MxDevice {
D3DDEVICEDESC m_HWDesc; // 0x0c
D3DDEVICEDESC m_HELDesc; // 0xd8
int operator==(MxDevice) const { return 0; }
int operator<(MxDevice) const { return 0; }
int operator==(Direct3DDeviceInfo) const { return 0; }
int operator<(Direct3DDeviceInfo) const { return 0; }
};
// SIZE 0x0c
@@ -131,7 +134,7 @@ struct MxDriver {
char* m_driverDesc; // 0x04
char* m_driverName; // 0x08
DDCAPS m_ddCaps; // 0x0c
list<MxDevice> m_devices; // 0x178
list<Direct3DDeviceInfo> m_devices; // 0x178
list<MxDisplayMode> m_displayModes; // 0x184
int operator==(MxDriver) const { return 0; }
@@ -141,7 +144,7 @@ struct MxDriver {
// clang-format off
// TEMPLATE: CONFIG 0x401000
// TEMPLATE: LEGO1 0x1009b900
// list<MxDevice,allocator<MxDevice> >::~list<MxDevice,allocator<MxDevice> >
// list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::~list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >
// clang-format on
// clang-format off
@@ -152,7 +155,7 @@ struct MxDriver {
// TEMPLATE: CONFIG 0x4010e0
// TEMPLATE: LEGO1 0x1009b9e0
// List<MxDevice>::~List<MxDevice>
// List<Direct3DDeviceInfo>::~List<Direct3DDeviceInfo>
// TEMPLATE: CONFIG 0x401130
// TEMPLATE: LEGO1 0x1009ba30
@@ -175,7 +178,7 @@ struct MxDriver {
// SYNTHETIC: CONFIG 0x401b00
// SYNTHETIC: LEGO1 0x1009c400
// list<MxDevice,allocator<MxDevice> >::insert
// list<Direct3DDeviceInfo,allocator<Direct3DDeviceInfo> >::insert
// SYNTHETIC: CONFIG 0x401b60
// SYNTHETIC: LEGO1 0x1009c460
@@ -185,7 +188,7 @@ struct MxDriver {
// MxDriver::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x1009d470
// MxDevice::`scalar deleting destructor'
// Direct3DDeviceInfo::`scalar deleting destructor'
// VTABLE: CONFIG 0x00406000
// VTABLE: LEGO1 0x100db814
@@ -209,16 +212,16 @@ public:
const char* EnumerateErrorToString(HRESULT p_error);
int ParseDeviceName(const char* p_deviceId);
int ProcessDeviceBytes(int p_deviceNum, GUID& p_guid);
int GetDevice(int p_deviceNum, MxDriver*& p_driver, MxDevice*& p_device);
int GetDevice(int p_deviceNum, MxDriver*& p_driver, Direct3DDeviceInfo*& p_device);
#if defined(MXDIRECTX_FOR_CONFIG)
int FormatDeviceName(char* p_buffer, const MxDriver* p_driver, const MxDevice* p_device) const;
int FormatDeviceName(char* p_buffer, const MxDriver* p_driver, const Direct3DDeviceInfo* p_device) const;
#endif
int FUN_1009d0d0();
int FUN_1009d210();
unsigned char DriverSupportsRequiredDisplayMode(MxDriver& p_driver);
unsigned char FUN_1009d3d0(MxDevice& p_device);
unsigned char FUN_1009d3d0(Direct3DDeviceInfo& p_device);
static void BuildErrorString(const char*, ...);
static BOOL CALLBACK