TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-26 23:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Cleanup: Resolve several compiler warnings associated with TORQUE_DEBUG.

Browse source
This commit is contained in:
Robert MacGregor 2022-04-25 18:23:15 -04:00
parent 8b127373c0
commit 39952a490f
7 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/gl/gfxGLTextureObject.cpp
View file

@ -45,7 +45,7 @@ GFXGLTextureObject::GFXGLTextureObject(GFXDevice * aDevice, GFXTextureProfile *p
mFrameAllocatorPtr(NULL)
{
#if TORQUE_DEBUG
#ifdef TORQUE_DEBUG
mFrameAllocatorMarkGuard = FrameAllocator::getWaterMark();
#endif
@ -90,7 +90,7 @@ GFXLockedRect* GFXGLTextureObject::lock(U32 mipLevel, RectI *inRect)
mFrameAllocatorMark = FrameAllocator::getWaterMark();
mFrameAllocatorPtr = (U8*)FrameAllocator::alloc( size );
mLockedRect.bits = mFrameAllocatorPtr;
#if TORQUE_DEBUG
#ifdef TORQUE_DEBUG
mFrameAllocatorMarkGuard = FrameAllocator::getWaterMark();
#endif

4
Engine/source/gfx/gl/gfxGLTextureObject.h
View file

@ -102,10 +102,10 @@ private:
//FrameAllocator
U32 mFrameAllocatorMark;
#if TORQUE_DEBUG
#ifdef TORQUE_DEBUG
U32 mFrameAllocatorMarkGuard;
#endif
U8 *mFrameAllocatorPtr;
};
#endif
#endif

2
Engine/source/gfx/gl/gfxGLUtils.h
View file

@ -208,7 +208,7 @@ GFXGLPreserveInteger TORQUE_CONCAT(preserve_, __LINE__) (GL_READ_FRAMEBUFFER, GL
GFXGLPreserveInteger TORQUE_CONCAT(preserve2_, __LINE__) (GL_DRAW_FRAMEBUFFER, GL_DRAW_FRAMEBUFFER_BINDING, (GFXGLPreserveInteger::BindFn)glBindFramebuffer)
#if TORQUE_DEBUG
#ifdef TORQUE_DEBUG
// Handy macro for checking the status of a framebuffer. Framebuffers can fail in
// all sorts of interesting ways, these are just the most common. Further, no existing GL profiling