diff --git a/glfw/egl_context.h b/glfw/egl_context.h index aa339baac..daaa2ad94 100644 --- a/glfw/egl_context.h +++ b/glfw/egl_context.h @@ -43,10 +43,6 @@ typedef Window EGLNativeWindowType; #define EGLAPIENTRY typedef struct wl_display* EGLNativeDisplayType; typedef struct wl_egl_window* EGLNativeWindowType; -#elif defined(_GLFW_MIR) - #define EGLAPIENTRY -typedef MirEGLNativeDisplayType EGLNativeDisplayType; -typedef MirEGLNativeWindowType EGLNativeWindowType; #else #error "No supported EGL platform selected" #endif @@ -216,4 +212,3 @@ GLFWbool _glfwChooseVisualEGL(const _GLFWwndconfig* wndconfig, const _GLFWfbconfig* fbconfig, Visual** visual, int* depth); #endif /*_GLFW_X11*/ - diff --git a/glfw/internal.h b/glfw/internal.h index 80f53c200..b949d306b 100644 --- a/glfw/internal.h +++ b/glfw/internal.h @@ -129,7 +129,6 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR = 1000004000, VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR = 1000005000, VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR = 1000006000, - VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR = 1000007000, VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR = 1000009000, VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK = 1000123000, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7FFFFFFF @@ -191,8 +190,6 @@ typedef void (APIENTRY * PFN_vkVoidFunction)(void); #include "x11_platform.h" #elif defined(_GLFW_WAYLAND) #include "wl_platform.h" -#elif defined(_GLFW_MIR) - #include "mir_platform.h" #elif defined(_GLFW_OSMESA) #include "null_platform.h" #else @@ -571,8 +568,6 @@ struct _GLFWlibrary GLFWbool KHR_xcb_surface; #elif defined(_GLFW_WAYLAND) GLFWbool KHR_wayland_surface; -#elif defined(_GLFW_MIR) - GLFWbool KHR_mir_surface; #endif } vk; diff --git a/glfw/vulkan.c b/glfw/vulkan.c index debc0eff4..3c8b6def2 100644 --- a/glfw/vulkan.c +++ b/glfw/vulkan.c @@ -136,9 +136,6 @@ GLFWbool _glfwInitVulkan(int mode) #elif defined(_GLFW_WAYLAND) else if (strcmp(ep[i].extensionName, "VK_KHR_wayland_surface") == 0) _glfw.vk.KHR_wayland_surface = GLFW_TRUE; -#elif defined(_GLFW_MIR) - else if (strcmp(ep[i].extensionName, "VK_KHR_mir_surface") == 0) - _glfw.vk.KHR_mir_surface = GLFW_TRUE; #endif } @@ -326,4 +323,3 @@ GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, return _glfwPlatformCreateWindowSurface(instance, window, allocator, surface); } -