diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index 36a0e50a..8c97281e 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -304,10 +304,6 @@ void _glfwResetPreeditTextCocoa(_GLFWwindow* window); void _glfwSetIMEStatusCocoa(_GLFWwindow* window, int active); int _glfwGetIMEStatusCocoa(_GLFWwindow* window); -EGLenum _glfwGetEGLPlatformCocoa(EGLint** attribs); -EGLNativeDisplayType _glfwGetEGLNativeDisplayCocoa(void); -EGLNativeWindowType _glfwGetEGLNativeWindowCocoa(_GLFWwindow* window); - void _glfwGetRequiredInstanceExtensionsCocoa(char** extensions); GLFWbool _glfwGetPhysicalDevicePresentationSupportCocoa(VkInstance instance, VkPhysicalDevice device, uint32_t queuefamily); VkResult _glfwCreateWindowSurfaceCocoa(VkInstance instance, _GLFWwindow* window, const VkAllocationCallbacks* allocator, VkSurfaceKHR* surface); diff --git a/src/win32_init.c b/src/win32_init.c index 4d7a75a2..4255cc32 100644 --- a/src/win32_init.c +++ b/src/win32_init.c @@ -729,15 +729,9 @@ GLFWbool _glfwConnectWin32(int platformID, _GLFWplatform* platform) _glfwWaitEventsWin32, _glfwWaitEventsTimeoutWin32, _glfwPostEmptyEventWin32, -#if !defined(GLFW_NO_OPENGL) - _glfwGetEGLPlatformWin32, - _glfwGetEGLNativeDisplayWin32, - _glfwGetEGLNativeWindowWin32, -#else NULL, NULL, NULL, -#endif _glfwGetRequiredInstanceExtensionsWin32, _glfwGetPhysicalDevicePresentationSupportWin32, _glfwCreateWindowSurfaceWin32, diff --git a/src/win32_platform.h b/src/win32_platform.h index b4de5ff2..8527c540 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -914,10 +914,6 @@ void _glfwResetPreeditTextWin32(_GLFWwindow* window); void _glfwSetIMEStatusWin32(_GLFWwindow* window, int active); int _glfwGetIMEStatusWin32(_GLFWwindow* window); -EGLenum _glfwGetEGLPlatformWin32(EGLint** attribs); -EGLNativeDisplayType _glfwGetEGLNativeDisplayWin32(void); -EGLNativeWindowType _glfwGetEGLNativeWindowWin32(_GLFWwindow* window); - void _glfwGetRequiredInstanceExtensionsWin32(char** extensions); GLFWbool _glfwGetPhysicalDevicePresentationSupportWin32(VkInstance instance, VkPhysicalDevice device, uint32_t queuefamily); VkResult _glfwCreateWindowSurfaceWin32(VkInstance instance, _GLFWwindow* window, const VkAllocationCallbacks* allocator, VkSurfaceKHR* surface); diff --git a/src/win32_window.c b/src/win32_window.c index f8973c30..9cc11feb 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -2793,57 +2793,6 @@ int _glfwGetIMEStatusWin32(_GLFWwindow* window) return result ? GLFW_TRUE : GLFW_FALSE; } -EGLenum _glfwGetEGLPlatformWin32(EGLint** attribs) -{ - if (_glfw.egl.ANGLE_platform_angle) - { - int type = 0; - - if (_glfw.egl.ANGLE_platform_angle_opengl) - { - if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_OPENGL) - type = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE; - else if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_OPENGLES) - type = EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE; - } - - if (_glfw.egl.ANGLE_platform_angle_d3d) - { - if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_D3D9) - type = EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE; - else if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_D3D11) - type = EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE; - } - - if (_glfw.egl.ANGLE_platform_angle_vulkan) - { - if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_VULKAN) - type = EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE; - } - - if (type) - { - *attribs = _glfw_calloc(3, sizeof(EGLint)); - (*attribs)[0] = EGL_PLATFORM_ANGLE_TYPE_ANGLE; - (*attribs)[1] = type; - (*attribs)[2] = EGL_NONE; - return EGL_PLATFORM_ANGLE_ANGLE; - } - } - - return 0; -} - -EGLNativeDisplayType _glfwGetEGLNativeDisplayWin32(void) -{ - return GetDC(_glfw.win32.helperWindowHandle); -} - -EGLNativeWindowType _glfwGetEGLNativeWindowWin32(_GLFWwindow* window) -{ - return window->win32.handle; -} - void _glfwGetRequiredInstanceExtensionsWin32(char** extensions) { if (!_glfw.vk.KHR_surface || !_glfw.vk.KHR_win32_surface) diff --git a/src/wl_init.c b/src/wl_init.c index a62770be..e143b87a 100644 --- a/src/wl_init.c +++ b/src/wl_init.c @@ -494,9 +494,9 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform) _glfwWaitEventsWayland, _glfwWaitEventsTimeoutWayland, _glfwPostEmptyEventWayland, - _glfwGetEGLPlatformWayland, - _glfwGetEGLNativeDisplayWayland, - _glfwGetEGLNativeWindowWayland, + NULL, + NULL, + NULL, _glfwGetRequiredInstanceExtensionsWayland, _glfwGetPhysicalDevicePresentationSupportWayland, _glfwCreateWindowSurfaceWayland, diff --git a/src/wl_platform.h b/src/wl_platform.h index 354eaff2..f573d500 100644 --- a/src/wl_platform.h +++ b/src/wl_platform.h @@ -684,10 +684,6 @@ void _glfwResetPreeditTextWayland(_GLFWwindow* window); void _glfwSetIMEStatusWayland(_GLFWwindow* window, int active); int _glfwGetIMEStatusWayland(_GLFWwindow* window); -EGLenum _glfwGetEGLPlatformWayland(EGLint** attribs); -EGLNativeDisplayType _glfwGetEGLNativeDisplayWayland(void); -EGLNativeWindowType _glfwGetEGLNativeWindowWayland(_GLFWwindow* window); - void _glfwGetRequiredInstanceExtensionsWayland(char** extensions); GLFWbool _glfwGetPhysicalDevicePresentationSupportWayland(VkInstance instance, VkPhysicalDevice device, uint32_t queuefamily); VkResult _glfwCreateWindowSurfaceWayland(VkInstance instance, _GLFWwindow* window, const VkAllocationCallbacks* allocator, VkSurfaceKHR* surface); diff --git a/src/wl_window.c b/src/wl_window.c index a259e5ea..1dc04df7 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -3522,24 +3522,6 @@ int _glfwGetIMEStatusWayland(_GLFWwindow* window) return GLFW_FALSE; } -EGLenum _glfwGetEGLPlatformWayland(EGLint** attribs) -{ - if (_glfw.egl.EXT_platform_base && _glfw.egl.EXT_platform_wayland) - return EGL_PLATFORM_WAYLAND_EXT; - else - return 0; -} - -EGLNativeDisplayType _glfwGetEGLNativeDisplayWayland(void) -{ - return _glfw.wl.display; -} - -EGLNativeWindowType _glfwGetEGLNativeWindowWayland(_GLFWwindow* window) -{ - return window->wl.egl.window; -} - void _glfwGetRequiredInstanceExtensionsWayland(char** extensions) { if (!_glfw.vk.KHR_surface || !_glfw.vk.KHR_wayland_surface) diff --git a/src/x11_init.c b/src/x11_init.c index 724eb1e7..40b4b8e3 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -1253,9 +1253,9 @@ GLFWbool _glfwConnectX11(int platformID, _GLFWplatform* platform) _glfwWaitEventsX11, _glfwWaitEventsTimeoutX11, _glfwPostEmptyEventX11, - _glfwGetEGLPlatformX11, - _glfwGetEGLNativeDisplayX11, - _glfwGetEGLNativeWindowX11, + NULL, + NULL, + NULL, _glfwGetRequiredInstanceExtensionsX11, _glfwGetPhysicalDevicePresentationSupportX11, _glfwCreateWindowSurfaceX11, diff --git a/src/x11_platform.h b/src/x11_platform.h index e5bb4f3f..6042fdf6 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -992,10 +992,6 @@ void _glfwResetPreeditTextX11(_GLFWwindow* window); void _glfwSetIMEStatusX11(_GLFWwindow* window, int active); int _glfwGetIMEStatusX11(_GLFWwindow* window); -EGLenum _glfwGetEGLPlatformX11(EGLint** attribs); -EGLNativeDisplayType _glfwGetEGLNativeDisplayX11(void); -EGLNativeWindowType _glfwGetEGLNativeWindowX11(_GLFWwindow* window); - void _glfwGetRequiredInstanceExtensionsX11(char** extensions); GLFWbool _glfwGetPhysicalDevicePresentationSupportX11(VkInstance instance, VkPhysicalDevice device, uint32_t queuefamily); VkResult _glfwCreateWindowSurfaceX11(VkInstance instance, _GLFWwindow* window, const VkAllocationCallbacks* allocator, VkSurfaceKHR* surface); diff --git a/src/x11_window.c b/src/x11_window.c index 2f09cf34..1495e7b8 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -3403,55 +3403,6 @@ int _glfwGetIMEStatusX11(_GLFWwindow* window) return window->x11.imeFocus; } -EGLenum _glfwGetEGLPlatformX11(EGLint** attribs) -{ - if (_glfw.egl.ANGLE_platform_angle) - { - int type = 0; - - if (_glfw.egl.ANGLE_platform_angle_opengl) - { - if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_OPENGL) - type = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE; - } - - if (_glfw.egl.ANGLE_platform_angle_vulkan) - { - if (_glfw.hints.init.angleType == GLFW_ANGLE_PLATFORM_TYPE_VULKAN) - type = EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE; - } - - if (type) - { - *attribs = _glfw_calloc(5, sizeof(EGLint)); - (*attribs)[0] = EGL_PLATFORM_ANGLE_TYPE_ANGLE; - (*attribs)[1] = type; - (*attribs)[2] = EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE; - (*attribs)[3] = EGL_PLATFORM_X11_EXT; - (*attribs)[4] = EGL_NONE; - return EGL_PLATFORM_ANGLE_ANGLE; - } - } - - if (_glfw.egl.EXT_platform_base && _glfw.egl.EXT_platform_x11) - return EGL_PLATFORM_X11_EXT; - - return 0; -} - -EGLNativeDisplayType _glfwGetEGLNativeDisplayX11(void) -{ - return _glfw.x11.display; -} - -EGLNativeWindowType _glfwGetEGLNativeWindowX11(_GLFWwindow* window) -{ - if (_glfw.egl.platform) - return &window->x11.handle; - else - return (EGLNativeWindowType) window->x11.handle; -} - void _glfwGetRequiredInstanceExtensionsX11(char** extensions) { if (!_glfw.vk.KHR_surface)