diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d1c17604f1..38b0a78216 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -877,6 +877,7 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY) if (mRT == &mMainRT) { // hacky -- allocate auxillary buffer + LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("check reflection map setup"); // improve Tracy scoping gCubeSnapshot = true; @@ -961,8 +962,10 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY) if (!gCubeSnapshot) // hack to not re-allocate various targets for cube snapshots { + LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("non-cube allocations"); // improve Tracy scoping if (RenderUIBuffer) { + LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("UIBuffer"); // improve Tracy scoping if (!mUIScreen.allocate(resX, resY, GL_RGBA)) { return false; @@ -971,9 +974,11 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY) if (RenderFSAAType > 0) { + LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("FSAABuffer"); // improve Tracy scoping if (!mFXAAMap.allocate(resX, resY, GL_RGBA)) return false; if (RenderFSAAType == 2) { + LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("SMAABuffer"); // improve Tracy scoping if (!mSMAABlendBuffer.allocate(resX, resY, GL_RGBA, false)) return false; } } @@ -988,6 +993,7 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY) if(RenderScreenSpaceReflections) { + LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("SSRBuffer"); // improve Tracy scoping mSceneMap.allocate(resX, resY, screenFormat, true); } else @@ -995,14 +1001,22 @@ bool LLPipeline::allocateScreenBufferInternal(U32 resX, U32 resY) mSceneMap.release(); } + {LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("mPostMapBuffer"); // improve Tracy scoping mPostMap.allocate(resX, resY, screenFormat); - + } // improve Tracy scoping // used to scale down textures // See LLViwerTextureList::updateImagesCreateTextures and LLImageGL::scaleDown + {LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("DownResBuffer");// create an independent preview screen target mDownResMap.allocate(1024, 1024, GL_RGBA); + }// create an independent preview screen target - mPreviewScreen.allocate(MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, GL_RGBA); // create an independent preview screen target + // create an independent preview screen target + {LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("PreviewScreenBuffer"); + mPreviewScreen.allocate(MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, GL_RGBA); + } // + {LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("BakeMapBuffer");// create an independent preview screen target mBakeMap.allocate(LLAvatarAppearanceDefines::SCRATCH_TEX_WIDTH, LLAvatarAppearanceDefines::SCRATCH_TEX_HEIGHT, GL_RGBA); + }// create an independent preview screen target } //HACK make screenbuffer allocations start failing after 30 seconds if (gSavedSettings.getBOOL("SimulateFBOFailure"))