From 3a34b55f08ba0227c23916d86c33d908a8244062 Mon Sep 17 00:00:00 2001 From: medievil1 <38597905+medievil1@users.noreply.github.com> Date: Tue, 14 Jun 2022 19:13:52 -0400 Subject: [PATCH] fix build issues --- src/core/hle/D3D8/Direct3D9/Direct3D9.cpp | 5 ++++- src/gui/WndMain.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp index 3f6065f28..f658b4bcc 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp @@ -2271,7 +2271,10 @@ static void EmuVerifyResourceIsRegistered(xbox::X_D3DResource *pResource, DWORD // would be overwritten by the surface created in SetRenderTarget // However, if a non-rendertarget surface is used here, we'll need to recreate it as a render target! auto hostResource = it->second.pHostResource; - assert(xboxResourceType == GetXboxD3DResourceType(pResource)); + auto xboxSurface = (xbox::X_D3DSurface*)pResource; + auto xboxTexture = (xbox::X_D3DTexture*)pResource; + auto xboxResourceType = GetXboxD3DResourceType(pResource); + // Only continue checking if we were able to get the surface desc, if it failed, we fall-through // to previous resource management behavior diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp index a0ac89790..1c61c8ccf 100644 --- a/src/gui/WndMain.cpp +++ b/src/gui/WndMain.cpp @@ -30,7 +30,7 @@ #define LOG_PREFIX CXBXR_MODULE::GUI #include "common/cxbxr.hpp" // for CxbxrExec - +#include "core\hle\D3D8\XbConvert.h" #include "Logging.h" #include "WndMain.h" #include "DlgAbout.h"