-

aiekick · Oct 8, 2023 · 5e636df · 5e636df
1 parent 7515368
commit 5e636df
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/3rdparty/SoGLSL b/3rdparty/SoGLSL
diff --git a/src/Backends/MainBackend.cpp b/src/Backends/MainBackend.cpp
@@ -519,9 +519,10 @@ void MainBackend::EndFrame() {
     MidiSystem::Instance()->updateMidiNeeded = false;
     // SoundSystem::Instance()->updateMidiNeeded = false;
     PictureExportSystem::Instance()->ScreenGrabbIfNeeded(MainBackend::sMainThread);
-    GuiBackend::Instance()->SwapBuffers(MainBackend::sMainThread);
-    iagp::InAppGpuProfiler::Instance()->Collect();
-    TracyGpuCollect;
+    {
+        AIGPScoped("Opengl", "%s", "Swap buffers");
+        GuiBackend::Instance()->SwapBuffers(MainBackend::sMainThread);
+    }
 }
 
 void MainBackend::StartOrStopVR() {
@@ -1139,7 +1140,7 @@ void MainBackend::DoRendering() {
     GuiBackend::MakeContextCurrent(MainBackend::sMainThread);
 
     TracyGpuZone("MainBackend::DoRendering");
-    AIGPScoped("MainBackend", "Rendering");
+    AIGPScoped("MainBackend", "%s", "Rendering");
 
     if (puPixelDebug.NeedRefresh()) {
         puPixelDebug.Capture(puDisplay_RenderPack, puDisplayQuality, CameraSystem::Instance());

diff --git a/src/Headers/NoodlesPlateBuild.h b/src/Headers/NoodlesPlateBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define NoodlesPlate_Prefix "NoodlesPlate"
-#define NoodlesPlate_BuildNumber 638
+#define NoodlesPlate_BuildNumber 667
 #define NoodlesPlate_MinorNumber 7
 #define NoodlesPlate_MajorNumber 0
-#define NoodlesPlate_BuildId "0.7.638"
+#define NoodlesPlate_BuildId "0.7.667"
diff --git a/src/main.cpp b/src/main.cpp
@@ -169,7 +169,7 @@ static void Imgui_Prepare()
 }
 
 static void Imgui_Render(const ImGuiIO& io) {
-    AIGPScoped("ImGui", "Imgui_Render");
+    AIGPScoped("ImGui", "%s", "Rendering");
 	GuiBackend::MakeContextCurrent(MainBackend::sMainThread);
 	ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
 
@@ -343,9 +343,11 @@ int main(int, char** argv)
 					{
 						mainBackendPtr->Render();
 					}
-					Imgui_Render(io);
-				}
-				mainBackendPtr->EndFrame();
+                    Imgui_Render(io);
+                    mainBackendPtr->EndFrame();
+                }
+                AIGPCollect;
+                TracyGpuCollect;
 
 				RenderDocController::Instance()->EndCaptureIfResquested();
 			}
+1 −1		3rdparty/ImGuiPack
+94 −74		src/Uniforms/UniformHelper.cpp