From e3d0faf599375f8b3f155e4b77c75bf461d3a335 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz <mattleibow@live.com> Date: Fri, 7 Mar 2025 06:00:51 +0800 Subject: [PATCH] Enable GL on Windows ARM --- src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp | 8 -------- src/utils/win/SkWGL_win.cpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp b/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp index 37da254b1209..c2776a92f587 100644 --- a/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp +++ b/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp @@ -13,12 +13,6 @@ #include "include/gpu/gl/GrGLInterface.h" #include "src/gpu/ganesh/gl/GrGLUtil.h" -#if defined(_M_ARM64) - -sk_sp<const GrGLInterface> GrGLMakeNativeInterface() { return nullptr; } - -#else - typedef HGLRC (WINAPI *WGLGetCurrentContextProc)(VOID); typedef PROC (WINAPI *WGLGetProcAddressProc)(LPCSTR name); @@ -109,6 +103,4 @@ sk_sp<const GrGLInterface> GrGLMakeNativeInterface() { return nullptr; } -#endif // ARM64 - #endif//defined(SK_BUILD_FOR_WIN) diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp index 4a78c87dc250..0607fe19e9a6 100644 --- a/src/utils/win/SkWGL_win.cpp +++ b/src/utils/win/SkWGL_win.cpp @@ -6,7 +6,7 @@ */ #include "include/core/SkTypes.h" -#if defined(SK_BUILD_FOR_WIN) && !defined(_M_ARM64) && !defined(WINUWP) +#if defined(SK_BUILD_FOR_WIN) && !defined(WINUWP) #include "src/utils/win/SkWGL.h"