Merge remote-tracking branch 'origin/main'

indra/llrender/llimagegl.cpp

@@ -2540,6 +2540,7 @@ void LLImageGLThread::run()
     // WorkQueue, likewise cleanup afterwards.
     mWindow->makeContextCurrent(mContext);
     gGL.init(false);
+	LL_PROFILER_GPU_CONTEXT;
     ThreadPool::run();
     gGL.shutdown();
     mWindow->destroySharedContext(mContext);

indra/llwindow/llwindowsdl.cpp

@@ -801,6 +801,8 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
         return FALSE;
     }
 
+	LL_PROFILER_GPU_CONTEXT;
+
 	// Disable vertical sync for swap
     toggleVSync(enable_vsync);
 
@@ -1220,6 +1222,7 @@ void LLWindowSDL::swapBuffers()
 	{
 		SDL_GL_SwapWindow(mWindow);
 	}
+	LL_PROFILER_GPU_COLLECT;
 }
 
 U32 LLWindowSDL::getFSAASamples()