From a6e5be01e49420bb7d8a2cccff1d00a63c4fe899 Mon Sep 17 00:00:00 2001 From: Yousef Khadadeh Date: Sun, 24 Aug 2025 10:38:33 +0300 Subject: [PATCH] Remove intel MSAA workaround --- src/DrawingProgram/ScreenshotTool.cpp | 2 +- src/MainProgram.hpp | 2 -- src/Toolbar.cpp | 3 --- src/main.cpp | 10 ---------- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/DrawingProgram/ScreenshotTool.cpp b/src/DrawingProgram/ScreenshotTool.cpp index eba9e70..dd1b1a8 100644 --- a/src/DrawingProgram/ScreenshotTool.cpp +++ b/src/DrawingProgram/ScreenshotTool.cpp @@ -201,7 +201,7 @@ void ScreenshotTool::take_screenshot(const std::filesystem::path& filePath) { #endif Vector2f canvasSize{controls.rectX2 - controls.rectX1, controls.rectY2 - controls.rectY1}; SkRect canvasBounds = SkRect::MakeLTRB(0.0f, 0.0f, canvasSize.x(), canvasSize.y()); - std::unique_ptr canvas = SkSVGCanvas::Make(canvasBounds, &out); + std::unique_ptr canvas = SkSVGCanvas::Make(canvasBounds, &out, SkSVGCanvas::kConvertTextToPaths_Flag | SkSVGCanvas::kNoPrettyXML_Flag); take_screenshot_svg(canvas.get(), controls.transparentBackground); } } diff --git a/src/MainProgram.hpp b/src/MainProgram.hpp index c35651e..d1fed38 100644 --- a/src/MainProgram.hpp +++ b/src/MainProgram.hpp @@ -70,8 +70,6 @@ class MainProgram { std::ofstream* logFile; std::deque logMessages; - bool disableIntelWorkaround = false; - std::string newAddr; MainProgram(); diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp index 7888c84..fd266c1 100644 --- a/src/Toolbar.cpp +++ b/src/Toolbar.cpp @@ -215,7 +215,6 @@ nlohmann::json Toolbar::get_config_json() { toRet["gridType"] = main.grid.gridType; toRet["guiFontSize"] = io->fontSize; toRet["showPerformance"] = showPerformance; - toRet["disableIntelWorkaround"] = main.disableIntelWorkaround; toRet["displayName"] = main.displayName; toRet["useNativeFilePicker"] = useNativeFilePicker; toRet["themeInUse"] = themeData.themeCurrentlyLoaded; @@ -266,7 +265,6 @@ void Toolbar::set_config_json(const nlohmann::json& j) { j.at("guiScale").get_to(guiScale); j.at("gridType").get_to(main.grid.gridType); j.at("guiFontSize").get_to(io->fontSize); - j.at("disableIntelWorkaround").get_to(main.disableIntelWorkaround); j.at("showPerformance").get_to(showPerformance); j.at("useNativeFilePicker").get_to(useNativeFilePicker); j.at("themeInUse").get_to(themeData.themeCurrentlyLoaded); @@ -1314,7 +1312,6 @@ void Toolbar::options_menu() { gui.checkbox_field("show performance metrics", "Show Metrics", &showPerformance); gui.input_scalar_fields("jump transition easing", "Jump Easing", &jumpTransitionEasing, 4, -10.0f, 10.0f, 2); #ifndef __EMSCRIPTEN__ - gui.checkbox_field("intel workaround", "Force enable MSAA on Intel", &main.disableIntelWorkaround); gui.text_label("Note: Requires restart to take effect. May cause bugs on Intel Graphics"); gui.input_scalar_field("fps cap slider", "FPS cap", &main.fpsLimit, 3.0f, 10000.0f); #endif diff --git a/src/main.cpp b/src/main.cpp index dcd4d1b..7c5a6e2 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -416,12 +416,6 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) { #else mS.m->load_config(); #endif - - - - if(mS.m->disableIntelWorkaround) - opts.fAllowMSAAOnNewIntel = true; - #ifdef USE_BACKEND_VULKAN #ifdef USE_SKIA_BACKEND_GRAPHITE std::unique_ptr displayParams = skwindow::DisplayParamsBuilder().build(); @@ -531,10 +525,6 @@ SDL_AppResult SDL_AppIterate(void *appstate) { #ifdef NDEBUG try { #endif - #ifdef USE_SKIA_BACKEND_GANESH - mS.m->window.ctx->resetContext(); - #endif - mS.m->window.scale = SDL_GetWindowPixelDensity(mS.window); #ifdef __EMSCRIPTEN__