copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove intel MSAA workaround

Browse source
This commit is contained in:
Yousef Khadadeh 2025-08-24 10:38:33 +03:00
parent 45e2a8a032
commit a6e5be01e4
4 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/DrawingProgram/ScreenshotTool.cpp
View file

@ -201,7 +201,7 @@ void ScreenshotTool::take_screenshot(const std::filesystem::path& filePath) {
#endif #endif
Vector2f canvasSize{controls.rectX2 - controls.rectX1, controls.rectY2 - controls.rectY1}; Vector2f canvasSize{controls.rectX2 - controls.rectX1, controls.rectY2 - controls.rectY1};
SkRect canvasBounds = SkRect::MakeLTRB(0.0f, 0.0f, canvasSize.x(), canvasSize.y()); SkRect canvasBounds = SkRect::MakeLTRB(0.0f, 0.0f, canvasSize.x(), canvasSize.y());
std::unique_ptr<SkCanvas> canvas = SkSVGCanvas::Make(canvasBounds, &out); std::unique_ptr<SkCanvas> canvas = SkSVGCanvas::Make(canvasBounds, &out, SkSVGCanvas::kConvertTextToPaths_Flag | SkSVGCanvas::kNoPrettyXML_Flag);
take_screenshot_svg(canvas.get(), controls.transparentBackground); take_screenshot_svg(canvas.get(), controls.transparentBackground);
} }
} }

2
src/MainProgram.hpp
View file

@ -70,8 +70,6 @@ class MainProgram {
std::ofstream* logFile; std::ofstream* logFile;
std::deque<Toolbar::LogMessage> logMessages; std::deque<Toolbar::LogMessage> logMessages;
bool disableIntelWorkaround = false;
std::string newAddr; std::string newAddr;
MainProgram(); MainProgram();

3
src/Toolbar.cpp
View file

@ -215,7 +215,6 @@ nlohmann::json Toolbar::get_config_json() {
toRet["gridType"] = main.grid.gridType; toRet["gridType"] = main.grid.gridType;
toRet["guiFontSize"] = io->fontSize; toRet["guiFontSize"] = io->fontSize;
toRet["showPerformance"] = showPerformance; toRet["showPerformance"] = showPerformance;
toRet["disableIntelWorkaround"] = main.disableIntelWorkaround;
toRet["displayName"] = main.displayName; toRet["displayName"] = main.displayName;
toRet["useNativeFilePicker"] = useNativeFilePicker; toRet["useNativeFilePicker"] = useNativeFilePicker;
toRet["themeInUse"] = themeData.themeCurrentlyLoaded; 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("guiScale").get_to(guiScale);
j.at("gridType").get_to(main.grid.gridType); j.at("gridType").get_to(main.grid.gridType);
j.at("guiFontSize").get_to(io->fontSize); j.at("guiFontSize").get_to(io->fontSize);
j.at("disableIntelWorkaround").get_to(main.disableIntelWorkaround);
j.at("showPerformance").get_to(showPerformance); j.at("showPerformance").get_to(showPerformance);
j.at("useNativeFilePicker").get_to(useNativeFilePicker); j.at("useNativeFilePicker").get_to(useNativeFilePicker);
j.at("themeInUse").get_to(themeData.themeCurrentlyLoaded); 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.checkbox_field("show performance metrics", "Show Metrics", &showPerformance);
gui.input_scalar_fields("jump transition easing", "Jump Easing", &jumpTransitionEasing, 4, -10.0f, 10.0f, 2); gui.input_scalar_fields("jump transition easing", "Jump Easing", &jumpTransitionEasing, 4, -10.0f, 10.0f, 2);
#ifndef __EMSCRIPTEN__ #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.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); gui.input_scalar_field("fps cap slider", "FPS cap", &main.fpsLimit, 3.0f, 10000.0f);
#endif #endif

10
src/main.cpp
View file

@ -416,12 +416,6 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
#else #else
mS.m->load_config(); mS.m->load_config();
#endif #endif
if(mS.m->disableIntelWorkaround)
opts.fAllowMSAAOnNewIntel = true;
#ifdef USE_BACKEND_VULKAN #ifdef USE_BACKEND_VULKAN
#ifdef USE_SKIA_BACKEND_GRAPHITE #ifdef USE_SKIA_BACKEND_GRAPHITE
std::unique_ptr<const skwindow::DisplayParams> displayParams = skwindow::DisplayParamsBuilder().build(); std::unique_ptr<const skwindow::DisplayParams> displayParams = skwindow::DisplayParamsBuilder().build();
@ -531,10 +525,6 @@ SDL_AppResult SDL_AppIterate(void *appstate) {
#ifdef NDEBUG #ifdef NDEBUG
try { try {
#endif #endif
#ifdef USE_SKIA_BACKEND_GANESH
mS.m->window.ctx->resetContext();
#endif
mS.m->window.scale = SDL_GetWindowPixelDensity(mS.window); mS.m->window.scale = SDL_GetWindowPixelDensity(mS.window);
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__