diff --git a/neo/framework/common_frame.cpp b/neo/framework/common_frame.cpp index 4081fd36..7a08fd03 100644 --- a/neo/framework/common_frame.cpp +++ b/neo/framework/common_frame.cpp @@ -518,7 +518,7 @@ void idCommonLocal::Frame() // This is the only place this is incremented idLib::frameNumber++; - OPTICK_TAG( "N", idLib::frameNumber ); + //OPTICK_TAG( "N", idLib::frameNumber ); // allow changing SIMD usage on the fly if( com_forceGenericSIMD.IsModified() ) diff --git a/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp b/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp index 8402091c..6a6b2344 100644 --- a/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp +++ b/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp @@ -135,16 +135,6 @@ bool NvrhiContext::operator!=( NvrhiContext& other ) const static NvrhiContext context; static NvrhiContext prevContext; -/* -================== -GL_CheckErrors -================== -*/ -// RB: added filename, line parms -bool GL_CheckErrors_( const char* filename, int line ) -{ - return false; -} /* ================== @@ -1579,7 +1569,7 @@ void idRenderBackend::GL_EndFrame() uint32_t swapIndex = deviceManager->GetCurrentBackBufferIndex(); OPTICK_EVENT( "EndFrame" ); - OPTICK_TAG( "Firing to swapIndex", swapIndex ); + //OPTICK_TAG( "Firing to swapIndex", swapIndex ); if( deviceManager->GetGraphicsAPI() == nvrhi::GraphicsAPI::VULKAN ) { @@ -1611,7 +1601,7 @@ void idRenderBackend::GL_BlockingSwapBuffers() uint32_t swapIndex = deviceManager->GetCurrentBackBufferIndex(); OPTICK_CATEGORY( "BlockingSwapBuffers", Optick::Category::Wait ); - OPTICK_TAG( "Waiting for swapIndex", swapIndex ); + //OPTICK_TAG( "Waiting for swapIndex", swapIndex ); // SRS - device-level sync kills perf by serializing command queue processing (CPU) and rendering (GPU) // - instead, use alternative sync method (based on command queue event queries) inside Present() diff --git a/neo/renderer/RenderBackend.cpp b/neo/renderer/RenderBackend.cpp index d1ea77bc..248767ea 100644 --- a/neo/renderer/RenderBackend.cpp +++ b/neo/renderer/RenderBackend.cpp @@ -4843,8 +4843,6 @@ void idRenderBackend::Bloom( const viewDef_t* _viewDef ) // BRIGHTPASS renderLog.OpenBlock( "Brightpass" ); - //GL_CheckErrors(); - //Framebuffer::Unbind(); //globalFramebuffers.hdrQuarterFBO->Bind(); @@ -5743,9 +5741,6 @@ void idRenderBackend::MotionBlur() return; } - GL_CheckErrors(); - - // clear the alpha buffer and draw only the hands + weapon into it so // we can avoid blurring them GL_State( GLS_COLORMASK | GLS_DEPTHMASK ); @@ -5830,7 +5825,6 @@ void idRenderBackend::MotionBlur() globalImages->currentDepthImage->Bind(); DrawElementsWithCounters( &unitSquareSurface ); - GL_CheckErrors(); } /* diff --git a/neo/renderer/RenderBackend.h b/neo/renderer/RenderBackend.h index 29ee657d..ffaad47f 100644 --- a/neo/renderer/RenderBackend.h +++ b/neo/renderer/RenderBackend.h @@ -45,20 +45,11 @@ If you have questions concerning this license or the applicable additional terms #if USE_OPTICK - #define USE_OPTICK_GPU 1 + #define USE_OPTICK_GPU 0 #else #define USE_OPTICK_GPU 0 #endif -// TODO remove -bool GL_CheckErrors_( const char* filename, int line ); -#if 1 // !defined(RETAIL) - #define GL_CheckErrors() GL_CheckErrors_(__FILE__, __LINE__) -#else - #define GL_CheckErrors() false -#endif -// RB end - struct tmu_t { unsigned int current2DMap; diff --git a/neo/renderer/RenderSystem.cpp b/neo/renderer/RenderSystem.cpp index bc70db17..0548f29e 100644 --- a/neo/renderer/RenderSystem.cpp +++ b/neo/renderer/RenderSystem.cpp @@ -643,8 +643,6 @@ void idRenderSystemLocal::SwapCommandBuffers_FinishRendering( return; } - //GL_CheckErrors(); - // After coming back from an autoswap, we won't have anything to render //if( frameData && frameData->cmdHead->next != NULL ) @@ -704,9 +702,6 @@ void idRenderSystemLocal::SwapCommandBuffers_FinishRendering( // RB: resize HDR buffers Framebuffer::CheckFramebuffers(); - - // check for errors - GL_CheckErrors(); } /*