From 2c95604ebc60324c14a5f5aac497eb9c2995ef37 Mon Sep 17 00:00:00 2001 From: Yousef Khadadeh Date: Wed, 20 Aug 2025 12:59:46 +0300 Subject: [PATCH] Fix non OpenGLES imginfo structs --- src/DrawingProgram/DrawingProgramCache.cpp | 2 +- src/DrawingProgram/EyeDropperTool.cpp | 2 +- src/DrawingProgram/ScreenshotTool.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DrawingProgram/DrawingProgramCache.cpp b/src/DrawingProgram/DrawingProgramCache.cpp index 3505ade..611ba85 100644 --- a/src/DrawingProgram/DrawingProgramCache.cpp +++ b/src/DrawingProgram/DrawingProgramCache.cpp @@ -314,7 +314,7 @@ void DrawingProgramCache::refresh_draw_cache(const std::shared_ptrresolution.x(), bvhNode->resolution.y(), kRGBA_8888_SkColorType, kPremul_SkAlphaType); #else - SkImageInfo imgInfo = SkImageInfo::MakeN32Premul(mS.m->window.size.x(), mS.m->window.size.y()); + SkImageInfo imgInfo = SkImageInfo::MakeN32Premul(bvhNode->resolution.x(), bvhNode->resolution.y()); #endif #ifdef USE_SKIA_BACKEND_GRAPHITE drawCache.surface = SkSurfaces::RenderTarget(drawP.world.main.window.recorder(), imgInfo, skgpu::Mipmapped::kNo, drawP.world.main.window.defaultMSAASurfaceProps); diff --git a/src/DrawingProgram/EyeDropperTool.cpp b/src/DrawingProgram/EyeDropperTool.cpp index ad25951..1c09157 100644 --- a/src/DrawingProgram/EyeDropperTool.cpp +++ b/src/DrawingProgram/EyeDropperTool.cpp @@ -43,7 +43,7 @@ void EyeDropperTool::tool_update() { #ifdef USE_BACKEND_OPENGLES_3_0 SkImageInfo imgInfo = SkImageInfo::Make(drawP.world.main.window.size.x(), drawP.world.main.window.size.y(), kRGBA_8888_SkColorType, kPremul_SkAlphaType); #else - SkImageInfo imgInfo = SkImageInfo::MakeN32Premul(mS.m->window.size.x(), mS.m->window.size.y()); + SkImageInfo imgInfo = SkImageInfo::MakeN32Premul(drawP.world.main.window.size.x(), drawP.world.main.window.size.y()); #endif #ifdef USE_SKIA_BACKEND_GRAPHITE sk_sp surface = SkSurfaces::RenderTarget(drawP.world.main.window.recorder(), imgInfo, skgpu::Mipmapped::kNo, &props); diff --git a/src/DrawingProgram/ScreenshotTool.cpp b/src/DrawingProgram/ScreenshotTool.cpp index 2c9edde..1d3f261 100644 --- a/src/DrawingProgram/ScreenshotTool.cpp +++ b/src/DrawingProgram/ScreenshotTool.cpp @@ -122,7 +122,7 @@ void ScreenshotTool::take_screenshot(const std::filesystem::path& filePath) { #ifdef USE_BACKEND_OPENGLES_3_0 SkImageInfo imgInfo = SkImageInfo::Make(drawP.world.main.window.size.x(), drawP.world.main.window.size.y(), kRGBA_8888_SkColorType, kPremul_SkAlphaType); #else - SkImageInfo imgInfo = SkImageInfo::MakeN32Premul(mS.m->window.size.x(), mS.m->window.size.y()); + SkImageInfo imgInfo = SkImageInfo::MakeN32Premul(drawP.world.main.window.size.x(), drawP.world.main.window.size.y()); #endif #ifdef USE_SKIA_BACKEND_GRAPHITE sk_sp surface = SkSurfaces::RenderTarget(drawP.world.main.window.recorder(), imgInfo, skgpu::Mipmapped::kNo, &drawP.world.main.window.defaultMSAASurfaceProps);