avx

Author: OpenFunscripter

CMakeLists.txt

@@ -8,12 +8,12 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
 
 if(WIN32)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX")
 endif()
 
 # =============
 # == OPTIONS ==
 # =============
-option(OFS_BENCHMARKS OFF)
 option(OFS_PROFILE OFF)
 
 # ====================

OFS-lib/CMakeLists.txt

@@ -103,15 +103,10 @@ target_compile_definitions(${PROJECT_NAME} PUBLIC
 	"IMGUI_IMPL_OPENGL_LOADER_GLAD2"
 )
 
-if(OFS_BENCHMARKS)
-	target_compile_definitions(${PROJECT_NAME} PUBLIC OFS_BENCHMARK_ENABLED=1)
-else()
-	target_compile_definitions(${PROJECT_NAME} PUBLIC OFS_BENCHMARK_ENABLED=0)
-endif()
-
 if(OFS_PROFILE)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC OFS_PROFILE_ENABLED=1)
 	target_link_libraries(${PROJECT_NAME} PUBLIC tracy)
+	message("== ${PROJECT_NAME} - Profiling enabled.")
 else()
 	target_compile_definitions(${PROJECT_NAME} PUBLIC OFS_PROFILE_ENABLED=0)
 endif()

OFS-lib/OFS_FileLogging.cpp

@@ -84,6 +84,7 @@ void OFS_FileLogger::Shutdown() noexcept
 
 inline static void LogToConsole(OFS_LogLevel level, const char* msg) noexcept
 {
+    OFS_PROFILE(__FUNCTION__);
     switch(level) {
         case OFS_LogLevel::OFS_LOG_INFO: SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, msg); break;
         case OFS_LogLevel::OFS_LOG_WARN: SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, msg); break;
@@ -93,13 +94,15 @@ inline static void LogToConsole(OFS_LogLevel level, const char* msg) noexcept
 }
 
 inline static void AppendToBuf(std::vector<char>& buffer, const char* msg, uint32_t size) noexcept {
+    OFS_PROFILE(__FUNCTION__);
     auto initialSize = buffer.size();               
     buffer.resize(initialSize + size);
     memcpy(buffer.data() + initialSize, msg, size);
 };
 
 inline static void AddNewLine() noexcept
 {
+    OFS_PROFILE(__FUNCTION__);
     // insert a newline if needed
     auto& buffer = Thread.LogMsgBuffer;
     if(!buffer.empty() &&  buffer.back() != '\n') {
@@ -110,6 +113,7 @@ inline static void AddNewLine() noexcept
 
 void OFS_FileLogger::LogToFileR(const char* prefix, const char* msg, bool newLine) noexcept
 {
+    OFS_PROFILE(__FUNCTION__);
     SDL_Log("%s %s", prefix, msg);
     SDL_AtomicLock(&Thread.lock);
 
@@ -126,6 +130,7 @@ void OFS_FileLogger::LogToFileR(const char* prefix, const char* msg, bool newLin
 
 void OFS_FileLogger::LogToFileR(OFS_LogLevel level, const char* msg, uint32_t size, bool newLine) noexcept
 {
+    OFS_PROFILE(__FUNCTION__);
     LogToConsole(level, msg);
     SDL_AtomicLock(&Thread.lock);
 
@@ -172,6 +177,7 @@ void OFS_FileLogger::Flush() noexcept
 
 void OFS_FileLogger::LogToFileF(OFS_LogLevel level, const char* fmt, ...) noexcept
 {
+    OFS_PROFILE(__FUNCTION__);
     char FormatBuffer[1024];
     va_list args;
     va_start(args, fmt);

OFS-lib/UI/OFS_Videoplayer.cpp

@@ -206,7 +206,7 @@ void VideoplayerWindow::renderToTexture() noexcept
 {
 	OFS_PROFILE(__FUNCTION__);
 	redrawVideo = false;
-	mpv_opengl_fbo fbo{ 0 };
+	mpv_opengl_fbo fbo = {0};
 	fbo.fbo = framebufferObj; 
 	fbo.w = MpvData.videoWidth;
 	fbo.h = MpvData.videoHeight;
@@ -314,7 +314,7 @@ bool VideoplayerWindow::setup(bool force_hw_decoding)
 	mpv_request_log_messages(mpv, "info");
 #endif
 
-	mpv_opengl_init_params init_params{ 0 };
+	mpv_opengl_init_params init_params = {0};
 	init_params.get_proc_address = getProcAddressMpv;
 
 	uint32_t enable = 1;

lib/tracy

@@ -1815,10 +1815,11 @@ void OpenFunscripter::step() noexcept {
                 ImGui::End();
             }
 
+#ifndef NDEBUG
             if (DebugDemo) {
                 ImGui::ShowDemoWindow(&DebugDemo);
             }
-
+#endif
             if (DebugMetrics) {
                 ImGui::ShowMetricsWindow(&DebugMetrics);
             }
@@ -2073,7 +2074,7 @@ void OpenFunscripter::saveHeatmap(const char* path, int width, int height)
     const bool mustLock = SDL_MUSTLOCK(surface); 
     if (mustLock) { SDL_LockSurface(surface); }
 
-    SDL_Rect rect{ 0 };
+    SDL_Rect rect = {0};
     rect.h = height;
 
     const float relStep = 1.f / width;
@@ -2769,8 +2770,10 @@ void OpenFunscripter::ShowMainMenuBar() noexcept
                 "\0");
             ImGui::Separator();
             if (ImGui::BeginMenu("DEBUG ONLY")) {
-                if (ImGui::MenuItem("ImGui", NULL, &DebugMetrics)) {}
+                if (ImGui::MenuItem("Metrics", NULL, &DebugMetrics)) {}
+#ifndef NDEBUG
                 if (ImGui::MenuItem("ImGui Demo", NULL, &DebugDemo)) {}
+#endif
                 ImGui::EndMenu();
             }
             ImGui::EndMenu();
@@ -2995,7 +2998,7 @@ bool OpenFunscripter::ShowMetadataEditorWindow(bool* open) noexcept
 }
 
 void OpenFunscripter::SetFullscreen(bool fullscreen) {
-    static SDL_Rect restoreRect{ 0,0, 1280,720 };
+    static SDL_Rect restoreRect = {0, 0, 1280, 720};
     if (fullscreen) {
         SDL_GetWindowPosition(window, &restoreRect.x, &restoreRect.y);
         SDL_GetWindowSize(window, &restoreRect.w, &restoreRect.h);

src/OpenFunscripter.cpp

@@ -43,8 +43,10 @@ class OpenFunscripter {
 
 	bool ShowMetadataEditor = false;
 	bool ShowProjectEditor = false;
-	bool DebugMetrics = false;
+#ifndef NDEBUG
 	bool DebugDemo = false;
+#endif
+	bool DebugMetrics = false;
 	bool ShowAbout = false;
 
 	std::vector<FunscriptAction> CopiedSelection;

src/OpenFunscripter.h

@@ -2,6 +2,13 @@
 
 int main(int argc, char* argv[])
 {
+#ifdef WIN32
+	if(!SDL_HasAVX()) {
+		Util::MessageBoxAlert("Missing AVX support", "CPU doesn't support AVX.");
+		SDL_Delay(3000);
+		return -1;
+	}
+#endif
 	OpenFunscripter app;
 	app.setup(argc, argv);
 	int code = app.run();