Skip to content

Commit 6d26eab

Browse files
IsaacMarovitzReimousTH
authored andcommitted
Fix compiler differences
Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
1 parent 0856116 commit 6d26eab

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

MarathonRecomp/gpu/video.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3361,7 +3361,7 @@ void Video::Present()
33613361
}
33623362
};
33633363

3364-
LOGFN_UTILITY("----------------------------[Surfaces]-----------------------------------");
3364+
LOGN_UTILITY("----------------------------[Surfaces]-----------------------------------");
33653365

33663366
SetSurface(pMyGraphicsDevice->m_spBackBuffer.get(), (GuestSurface*)pApp->m_pBackBufferSurface.get());
33673367
SetSurface(pMyGraphicsDevice->m_spDepthStencil.get(), (GuestSurface*)pApp->m_pDepthStencilSurface.get());
@@ -3395,7 +3395,7 @@ void Video::Present()
33953395
// GuestToHostFunction<void>(sub_82592E98, surface.second.get(), gSurface, params.width, params.height);
33963396
}
33973397

3398-
LOGFN_UTILITY("----------------------------[Textures]-----------------------------------");
3398+
LOGN_UTILITY("----------------------------[Textures]-----------------------------------");
33993399

34003400
for (auto& texture : pRenderTargetContainer->m_mspFrameBuffer)
34013401
{
@@ -3434,7 +3434,7 @@ void Video::Present()
34343434
LOGFN_UTILITY(" Surface ({:08X}) ({}x{}) {:08X}", (uint64_t)surface, surface->m_Width.get(), surface->m_Height.get(), (uint64_t)surface->m_spTexture.get());
34353435
}
34363436

3437-
LOGFN_UTILITY("----------------------------[m_mspDepthStencil_256]-----------------------------------");
3437+
LOGN_UTILITY("----------------------------[m_mspDepthStencil_256]-----------------------------------");
34383438

34393439
for (auto& surface : pRenderTargetContainer->m_mspDepthStencil_256)
34403440
{
@@ -3444,7 +3444,7 @@ void Video::Present()
34443444
LOGFN_UTILITY("- \"{}\" ({}x{}) ({:08X})", surfacePtr->m_MgrResourceName.c_str(), surfacePtr->m_Width.get(), surfacePtr->m_Height.get(), (uint64_t)surfacePtr.get());
34453445
}
34463446

3447-
LOGFN_UTILITY("----------------------------[m_mspPostEffect]-----------------------------------");
3447+
LOGN_UTILITY("----------------------------[m_mspPostEffect]-----------------------------------");
34483448

34493449
for (auto& texture : pRenderTargetContainer->m_mspPostEffect)
34503450
{
@@ -3454,7 +3454,7 @@ void Video::Present()
34543454
LOGFN_UTILITY("- \"{}\" ({}x{}) ({:08X})", texturePtr->m_MgrResourceName.c_str(), texturePtr->m_Width.get(), texturePtr->m_Height.get(), (uint64_t)texturePtr.get());
34553455
}
34563456

3457-
LOGFN_UTILITY("----------------------------[m_mspPostEffectAfter]-----------------------------------");
3457+
LOGN_UTILITY("----------------------------[m_mspPostEffectAfter]-----------------------------------");
34583458

34593459
for (auto& texture : pRenderTargetContainer->m_mspPostEffectAfter)
34603460
{
@@ -3641,7 +3641,7 @@ static void ProcBeginCommandList(const RenderCommand& cmd)
36413641
BeginCommandList();
36423642
}
36433643

3644-
static GuestSurface* GetBackBuffer()
3644+
static GuestSurface* GetBackBuffer()
36453645
{
36463646
if (g_backBuffer)
36473647
g_backBuffer->AddRef();

MarathonRecomp/gpu/video.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -474,11 +474,11 @@ enum GuestTextureAddress
474474

475475
inline bool g_needsResize;
476476

477-
extern GuestSurface* GetBackBuffer();
477+
static GuestSurface* GetBackBuffer();
478478

479-
extern void SetRenderTarget(GuestDevice* device, uint32_t index, GuestSurface* renderTarget);
480-
extern void SetDepthStencilSurface(GuestDevice* device, GuestSurface* depthStencil);
481-
extern GuestTexture* CreateTexture(uint32_t width, uint32_t height, uint32_t depth, uint32_t levels, uint32_t usage, uint32_t format, uint32_t pool, uint32_t type);
479+
static void SetRenderTarget(GuestDevice* device, uint32_t index, GuestSurface* renderTarget);
480+
static void SetDepthStencilSurface(GuestDevice* device, GuestSurface* depthStencil);
481+
static GuestTexture* CreateTexture(uint32_t width, uint32_t height, uint32_t depth, uint32_t levels, uint32_t usage, uint32_t format, uint32_t pool, uint32_t type);
482482
static GuestSurface* CreateSurface(uint32_t width, uint32_t height, uint32_t format, uint32_t multiSample, GuestSurfaceCreateParams* params);
483483

484484
extern std::unique_ptr<GuestTexture> LoadTexture(const uint8_t* data, size_t dataSize, RenderComponentMapping componentMapping = RenderComponentMapping());

0 commit comments

Comments
 (0)