From e88b7a0783cd21143a28773f989ea15663d6a0ac Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sat, 26 Sep 2020 22:43:26 -0500 Subject: [PATCH] minor cleanups: clean up mismatched PROFILE_START+PROFILE_END() that was in/out of the mip packign for loop on the gl side, leaving just the self-cleaning PROFILE_SCOPE(GFXGLTextureObject_copyToBmp); similar to the dx11 side void GuiGameListMenuCtrl::removeRow(const S32& row); (the GuiGameListMenuCtrl:: bit in the class iteslf is redundant and making linux unhappy) --- Engine/source/gfx/gl/gfxGLTextureObject.cpp | 3 --- Engine/source/gui/controls/guiGameListMenuCtrl.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Engine/source/gfx/gl/gfxGLTextureObject.cpp b/Engine/source/gfx/gl/gfxGLTextureObject.cpp index fd686854a..9eabc8114 100644 --- a/Engine/source/gfx/gl/gfxGLTextureObject.cpp +++ b/Engine/source/gfx/gl/gfxGLTextureObject.cpp @@ -185,8 +185,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp) U8* orig = (U8*)mem.alloc(srcPixelCount * srcBytesPerPixel); glGetTexImage(mBinding, mip, GFXGLTextureFormat[mFormat], GFXGLTextureType[mFormat], orig); - - PROFILE_START(GFXGLTextureObject_copyToBmp_pixCopy); if (mFormat == GFXFormatR16G16B16A16F) { dMemcpy(dest, orig, srcPixelCount * srcBytesPerPixel); @@ -207,7 +205,6 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp) } } glBindTexture(mBinding, NULL); - PROFILE_END(); return true; } diff --git a/Engine/source/gui/controls/guiGameListMenuCtrl.h b/Engine/source/gui/controls/guiGameListMenuCtrl.h index 87c5aa769..cd2f636f7 100644 --- a/Engine/source/gui/controls/guiGameListMenuCtrl.h +++ b/Engine/source/gui/controls/guiGameListMenuCtrl.h @@ -164,7 +164,7 @@ public: void addRow(const char* label, const char* bitmapName, const char* callback, S32 icon, S32 yPad, bool enabled, const char* tooltip); //Removes row at the provided index - void GuiGameListMenuCtrl::removeRow(const S32& row); + void removeRow(const S32& row); /// Gets the text for the currently selected option of the given row. ///