feat: better cli options, software rasterer, buildinfo cleanups

stergiotis · stergiotis · commit 8e6f8566d25d · 2024-06-06T23:13:58.000+02:00
diff --git a/skia/CMakeLists.txt b/skia/CMakeLists.txt
@@ -4,7 +4,7 @@ project(imgui_skia_exe)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_COMPILER clang++)
 
-add_compile_definitions(TRACY_ENABLE)
+add_compile_definitions()
 include_directories("${CMAKE_CURRENT_LIST_DIR}/./imgui"
 "${CMAKE_CURRENT_LIST_DIR}/./src/arena/simple"
 "${CMAKE_CURRENT_LIST_DIR}/./contrib/skia"
@@ -19,19 +19,11 @@ include_directories("${CMAKE_CURRENT_LIST_DIR}/./imgui"
 "${CMAKE_CURRENT_LIST_DIR}/./contrib/skia/modules/svg/include"
 "${CMAKE_CURRENT_LIST_DIR}/./contrib/skia/include"
 "${CMAKE_CURRENT_LIST_DIR}/./contrib/skia/include/core"
-"${CMAKE_CURRENT_LIST_DIR}/./contrib/tracy/public"
-"${CMAKE_CURRENT_LIST_DIR}/./contrib/flatbuffers")
+"${CMAKE_CURRENT_LIST_DIR}/./contrib/flatbuffers"
+"${CMAKE_CURRENT_LIST_DIR}/./contrib/tracy/public")
 set(COMPILE_OPTIONS -std=c++20
--g
--gdwarf-4
--Wall
--Wformat
--Wextra
--O1
--fsanitize=address
--fno-omit-frame-pointer
--DIMZERO_DEBUG_BUILD)
-link_libraries(-fsanitize=address
+-O3)
+link_libraries(-DNDEBUG
 -ldl
 -lpthread
 -lfreetype
@@ -224,8 +216,8 @@ set_property(TARGET skia_imported PROPERTY IMPORTED_OBJECTS "${CMAKE_CURRENT_LIS
 "${CMAKE_CURRENT_LIST_DIR}/./contrib/skia/out/Static/libpiex.a"
 "${CMAKE_CURRENT_LIST_DIR}/./contrib/skia/out/Static/libpng.a")
 
-add_library(tracyEnabled OBJECT "${CMAKE_CURRENT_LIST_DIR}/./contrib/tracy/public/TracyClient.cpp")
 
+add_library(tracyDisabled OBJECT "${CMAKE_CURRENT_LIST_DIR}/./contrib/tracy/public/TracyClient.cpp")
 add_executable(imgui_skia_exe $<TARGET_OBJECTS:imguiWithSkia>
 $<TARGET_OBJECTS:render>
 $<TARGET_OBJECTS:marshalling>
@@ -239,5 +231,5 @@ $<TARGET_OBJECTS:imguiFlamegraph>
 $<TARGET_OBJECTS:imguiTextedit>
 $<TARGET_OBJECTS:skia>
 $<TARGET_OBJECTS:skia_imported>
-$<TARGET_OBJECTS:tracyEnabled>)
+$<TARGET_OBJECTS:tracyDisabled>)
 
diff --git a/skia/build_cpp.sh b/skia/build_cpp.sh
@@ -7,6 +7,19 @@ flatc="../../contrib/flatbuffers/flatc"
 
 ./cmakelists.dhall
 
+generate_buildinfo() {
+   echo -en "#pragma once\nnamespace buildinfo {\n static const char *gitCommit=\""
+   git log -1  --pretty=format:"%H" | tr -d "\n"
+   echo -en "\";\n static const bool gitDirty="
+   if [[ $(git diff --stat) != '' ]]; then
+     echo -n "true"
+   else
+     echo -n "false"
+   fi
+   echo -en ";\n}\n"
+}
+generate_buildinfo > src/buildinfo.gen.h
+
 mkdir -p build
 cd build
 cmake ../CMakeLists.txt
diff --git a/skia/build_flatbuffers.sh b/skia/build_flatbuffers.sh
@@ -2,5 +2,5 @@
 here=$(dirname "$(readlink -f "$BASH_SOURCE")")
 set -ev
 cd ../../contrib/flatbuffers
-cmake -G "Unix Makefiles"
+cmake -G "Unix Makefiles" .
 make -j
diff --git a/skia/common.dhall b/skia/common.dhall
@@ -1,3 +1,5 @@
+let lib = ../dhall/lib.dhall
+let debug = False
 let sourceTreePartsRepo = ../dhall/sourceTreeParts.dhall
 let sourceTreeParts = [
 	, sourceTreePartsRepo.imguiWithSkia
@@ -13,9 +15,8 @@ let sourceTreeParts = [
 	, sourceTreePartsRepo.imguiTextedit
 	, sourceTreePartsRepo.binding
 	, sourceTreePartsRepo.skia
-	, sourceTreePartsRepo.tracyEnabled
 	, sourceTreePartsRepo.flatbuffers
-]
+] # (if debug then [ , sourceTreePartsRepo.tracyEnabled ] else [ ,sourceTreePartsRepo.tracyDisabled ] : List lib.sourceTreePart.Type )
 let cxx = "clang++"
 let cppstd = 20
 let cxxflagsDebug = [
@@ -37,7 +38,6 @@ let ldflagsDebug = ["-fsanitize=address"] : List Text
 let ldflagsRelease = ["-DNDEBUG"] : List Text
 --let stdlibFlags = ["-stdlib=libc++"] : List Text
 let stdlibFlags = [] : List Text
-let debug = False
 in {
     , sourceTreeParts
     , cxx
diff --git a/skia/run.sh b/skia/run.sh
@@ -2,6 +2,5 @@
 set -ev
 here=$(dirname "$(readlink -f "$BASH_SOURCE")")
 cd "$here"
-make -j
 ./build_go.sh
 ./main_go --logFormat console --httpServerAddress localhost:8888 demo --imGuiBinary ./imgui_exe --mainFontTTF ./SauceCodeProNerdFontMono-Regular.ttf --mainFontSizeInPixels 18
diff --git a/skia/run_pipe.sh b/skia/run_pipe.sh
@@ -4,5 +4,5 @@ rm -f transfer
 mkfifo transfer
 font="./martian/MartianMono-StdRg.ttf"
 font="./SauceCodeProNerdFontMono-Regular.ttf"
-./main_go --logFormat console demo --mainFontTTF "$font" --mainFontSizeInPixels 13 "$@" < transfer | ./imgui_exe -ttfFilePath "$font" > transfer
+./main_go --logFormat console demo --mainFontTTF "$font" --mainFontSizeInPixels 13 "$@" < transfer | ./imgui_exe -ttfFilePath "$font" -fffiInterpreter on -skiaBackendType gl -vsync on -backdropFilter on > transfer
 rm -f transfer
diff --git a/skia/skia/modified/ImGuiLayer.cpp b/skia/skia/modified/ImGuiLayer.cpp
@@ -42,7 +42,7 @@ static void build_ImFontAtlas(ImFontAtlas& atlas, SkPaint& fontPaint) {
     atlas.TexID = &fontPaint;
 }
 
-ImGuiLayer::ImGuiLayer(bool standalone) : fWindow(nullptr), fSvgBytesWritten(0), fSkpBytesWritten(0), fPngBytesWritten(0), fStandalone(standalone), fTotalVectorCmdSerializedSize(0) {
+ImGuiLayer::ImGuiLayer(const CliOptions *opts) : fWindow(nullptr), fSvgBytesWritten(0), fSkpBytesWritten(0), fPngBytesWritten(0), ffffiInterpreter(opts->fffiInterpreter), fTotalVectorCmdSerializedSize(0) {
     // ImGui initialization:
     ImGui::CreateContext();
     ImGuiIO& io = ImGui::GetIO();
@@ -70,7 +70,7 @@ ImGuiLayer::ImGuiLayer(bool standalone) : fWindow(nullptr), fSvgBytesWritten(0),
     io.KeyMap[ImGuiKey_Y]          = (int)skui::Key::kY;
     io.KeyMap[ImGuiKey_Z]          = (int)skui::Key::kZ;
 
-    if(!fStandalone) {
+    if(ffffiInterpreter) {
         render_init();
     }
 
@@ -79,12 +79,20 @@ ImGuiLayer::ImGuiLayer(bool standalone) : fWindow(nullptr), fSvgBytesWritten(0),
 
     fVectorCmdSkiaRenderer.setVertexDrawPaint(&fFontPaint);
     fVectorCmdSkiaRenderer.setParagraphHandler(ImGui::paragraph);
+    RenderModeE mode = 0;
+    if(opts->backdropFilter) {
+        mode |= RenderModeE_BackdropBlur;
+    }
+    if(opts->sketchFilter) {
+        mode |= RenderModeE_Sketch;
+    }
+    fVectorCmdSkiaRenderer.changeRenderMode(mode);
 
     fSkiaBackendActive = true;
 }
 
 ImGuiLayer::~ImGuiLayer() {
-    if(!fStandalone) {
+    if(ffffiInterpreter) {
         render_cleanup();
     }
     ImGui::DestroyContext();
@@ -272,14 +280,15 @@ void ImGuiLayer::onPaint(SkSurface* surface) { ZoneScoped;
     auto renderMode = fVectorCmdSkiaRenderer.getRenderMode();
     resetReceiveStat();
     resetSendStat();
-    if(fStandalone) { ZoneScopedN("demo window");
-        ImGui::ShowDemoWindow();
-    } else { ZoneScopedN("render fffi commands");
+    if(ffffiInterpreter) { ZoneScopedN("render fffi commands");
         render_render();
+    } else { ZoneScopedN("demo window");
+        ImGui::ShowDemoWindow();
     }
 
     SaveFormatE saveFormat = SaveFormatE_None;
     if(ImGui::Begin("ImZeroSkia Settings")) { ZoneScoped;
+        ImGui::Text("gitCommit=\"%s\",dirty=%s",buildinfo::gitCommit,buildinfo::gitDirty ? "yes" : "no");
         fImZeroSkiaSetupUi.render(saveFormat, fVectorCmdSkiaRenderer, fSkiaBackendActive,
                                   fTotalVectorCmdSerializedSize, totalSentBytes+totalReceivedBytes,
                                   fSkpBytesWritten,fSvgBytesWritten, fPngBytesWritten,
diff --git a/skia/skia/modified/ImGuiLayer.h b/skia/skia/modified/ImGuiLayer.h
@@ -27,6 +27,7 @@
 
 #include "../vectorCmdSkiaRenderer.h"
 #include "../setupUI.h"
+#include "cliOptions.h"
 
 class SkCanvas;
 class SkSurface;
@@ -39,7 +40,7 @@ enum class ModifierKey;
 
 class ImGuiLayer : public sk_app::Window::Layer {
 public:
-    ImGuiLayer(bool standalone);
+    ImGuiLayer(const CliOptions *opts);
     ~ImGuiLayer() override;
 
     void setScaleFactor(float scaleFactor);
@@ -66,7 +67,7 @@ class ImGuiLayer : public sk_app::Window::Layer {
     size_t fSvgBytesWritten;
     size_t fPngBytesWritten;
     ImZeroSkiaSetupUI fImZeroSkiaSetupUi;
-    bool fStandalone;
+    bool ffffiInterpreter;
 
     void drawImDrawData(SkCanvas &canvas);
     void drawImGuiVectorCmdsFB(SkCanvas &canvas);
diff --git a/skia/skia/modified/app.cpp b/skia/skia/modified/app.cpp
@@ -58,74 +58,36 @@ void operator delete(void* ptr) noexcept {
 #endif
 #endif
 
-static bool hasFlag(int argc, char **argv,const char *flag) {
-    for(int i=0;i<argc;i++) {
-        if(strcmp(argv[i],flag) == 0) {
-            return true;
-        }
-    }
-    return false;
-}
-static const char *findFlagValueDefault(int argc, char **argv,const char *flag,const char *defaultValue) {
-    for(int i=0;i<argc;i++) {
-        if(strcmp(argv[i],flag) == 0) {
-            if(i == argc) {
-                return defaultValue;
-            } else {
-                return argv[i+1];
-            }
-        }
-    }
-    return defaultValue;
-}
-static void showUsage(const char *name, FILE *file) {
-   fprintf(stderr, "%s -ttfFilePath <file.ttf> -fontDyFudge <float> -fffiInFile <fffiIn> -fffiOutFile <fffiOut> -disableVsync -disableFffi\n", name);
-}
+CliOptions opts;
 
 Application* Application::Create(int argc, char** argv, void* platformData) {
     #ifdef TRACY_ENABLE
     ImGui::SetAllocatorFunctions(imZeroMemAlloc,imZeroMemFree,nullptr);
     #endif
 
-    auto const ttfFilePath = findFlagValueDefault(argc,argv,"-ttfFilePath","./SauceCodeProNerdFontPropo-Regular.ttf");
-    auto const fffiInFile = findFlagValueDefault(argc, argv, "-fffiInFile", nullptr);
-    auto const fffiOutFile = findFlagValueDefault(argc, argv, "-fffiOutFile", nullptr);
-    auto const fontDyFudge = findFlagValueDefault(argc, argv, "-fontDyFudge", "0.0");
-
-    {
-        auto const fontDyFudgeNum = strtof(fontDyFudge, nullptr);
-        if(!isnanf(fontDyFudgeNum) && fontDyFudgeNum >= -10000.0f && fontDyFudgeNum <= 10000.0f) {
-            fprintf(stderr,"using font dy fudge value %f px to modify font baseline\n", fontDyFudgeNum);
-            ImGui::skiaFontDyFudge = fontDyFudgeNum;
-        }
-    }
-
-    if(hasFlag(argc,argv,"-help")) {
-        showUsage(argv[0],stderr);
-        exit(0);
-    }
+    opts.parse(argc,argv);
+    ImGui::skiaFontDyFudge = opts.fontDyFudge;
 
-    const auto standalone = hasFlag(argc, argv, "-disableFffi");
-    if(!standalone) {
-        if(fffiInFile != nullptr) {
-            fdIn = fopen(fffiInFile, "r");
+    if(opts.fffiInterpreter) {
+        if(opts.fffiInFile != nullptr) {
+            fdIn = fopen(opts.fffiInFile, "r");
             if(fdIn == nullptr) {
-                fprintf(stderr, "unable to open fffInFile %s: %s", fffiInFile, strerror(errno));
+                fprintf(stderr, "unable to open fffInFile %s: %s", opts.fffiInFile, strerror(errno));
                 exit(1);
             }
             setvbuf(fdIn, nullptr,_IONBF,0);
         }
-        if(fffiOutFile != nullptr) {
-            fdOut = fopen(fffiOutFile, "w");
+        if(opts.fffiOutFile != nullptr) {
+            fdOut = fopen(opts.fffiOutFile, "w");
             if(fdOut == nullptr) {
-                fprintf(stderr, "unable to open fffOutFile %s: %s", fffiOutFile, strerror(errno));
+                fprintf(stderr, "unable to open fffOutFile %s: %s", opts.fffiOutFile, strerror(errno));
                 exit(1);
             }
             setvbuf(fdOut, nullptr,_IONBF,0);
         }
     }
 
-    auto ttfData = SkData::MakeFromFileName(ttfFilePath);
+    auto ttfData = SkData::MakeFromFileName(opts.ttfFilePath);
     auto fontMgr = SkFontMgr_New_Custom_Data(SkSpan<sk_sp<SkData>>(&ttfData,1));
 
     const auto typeface = fontMgr->makeFromData(ttfData);
@@ -140,30 +102,37 @@ Application* Application::Create(int argc, char** argv, void* platformData) {
     return new ImZeroSkiaClient(argc, argv, platformData);
 }
 
-ImZeroSkiaClient::ImZeroSkiaClient(int argc, char** argv, void* platformData)
+ImZeroSkiaClient::ImZeroSkiaClient(int argc, char** argv, void* platformData) : fBackendType(Window::kRaster_BackendType) {
+    if(strcmp(opts.skiaBackendType,"gl") == 0) {
 #if defined(SK_GL)
-        : fBackendType(Window::kNativeGL_BackendType)
-#elif defined(SK_VULKAN)
-        : fBackendType(Window::kVulkan_BackendType)
+        fBackendType=Window::kNativeGL_BackendType;
+#else
+        fprintf(stderr,"gl backend is not supported (SK_GL not defined)\n");
+        exit(1);
+#endif
+    }
+    if(strcmp(opts.skiaBackendType,"vulkan") == 0) {
+#if defined(SK_VULKAN)
+        fBackendType=Window::kVulkan_BackendType;
 #else
-        : fBackendType(Window::kRaster_BackendType)
+        fprintf(stderr,"vulkan backend is not supported (SK_VULKAN not defined)\n");
+        exit(1);
 #endif
-        {
-    const auto standalone = hasFlag(argc, argv, "-disableFffi");
+    }
+    if(strcmp(opts.skiaBackendType,"raster") == 0) {
+        fBackendType=Window::kRaster_BackendType;
+    }
 
     SkGraphics::Init();
 
     fWindow = Window::CreateNativeWindow(platformData);
     {
         auto params = DisplayParams();
-
-        if(hasFlag(argc,argv,"-disableVsync")) {
-            params.fDisableVsync = true;
-        }
+        params.fDisableVsync = !opts.vsync;
         fWindow->setRequestedDisplayParams(params);
     }
 
-    fImGuiLayer = std::make_unique<ImGuiLayer>(standalone);
+    fImGuiLayer = std::make_unique<ImGuiLayer>(&opts);
     fImGuiLayer->setScaleFactor(fWindow->scaleFactor());
 
     // register callbacks
@@ -183,22 +152,7 @@ void ImZeroSkiaClient::updateTitle() {
         return;
     }
 
-    SkString title("ImZeroSkiaClient ");
-    if (Window::kRaster_BackendType == fBackendType) {
-        title.append("Raster");
-    } else {
-#if defined(SK_GL)
-        title.append("GL");
-#elif defined(SK_VULKAN)
-        title.append("Vulkan");
-#elif defined(SK_DAWN)
-        title.append("Dawn");
-#else
-        title.append("Unknown GPU backend");
-#endif
-    }
-
-    fWindow->setTitle(title.c_str());
+    fWindow->setTitle(opts.appTitle);
 }
 
 void ImZeroSkiaClient::onBackendCreated() {
diff --git a/skia/skia/modified/app.h b/skia/skia/modified/app.h
@@ -15,6 +15,7 @@
 #include "tools/skui/ModifierKey.h"
 
 #include "ImGuiLayer.h"
+#include "cliOptions.h"
 
 class SkSurface;
 
