NativeStateMir: Remove Mir/mirclient support

The mirclient API was deprecated a long time ago and removed from Mir 2.0 in favor of Wayland.
9D-Tony · Jan 19, 2023 · b48eda4 · b48eda4
1 parent 08ea092
commit b48eda4
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 350 deletions.
diff --git a/INSTALL b/INSTALL
@@ -20,12 +20,12 @@ WAF build system
 ----------------
 
 glmark2 previously used the WAF build system, and the builds for some flavors
-(dispmanx, win32, mir) have not been ported to the meson build system. For such
+(dispmanx, win32) have not been ported to the meson build system. For such
 cases follow the instructions below.
 
 To configure glmark2 use:
 
-$ ./waf configure --with-flavors=dispmanx-glesv2,win32-gl,win32-glesv2,mir-gl,mir-glesv2... [--data-path=DATA_PATH --prefix=PREFIX]
+$ ./waf configure --with-flavors=dispmanx-glesv2,win32-gl,win32-glesv2... [--data-path=DATA_PATH --prefix=PREFIX]
 
 To build use:
 

diff --git a/src/gl-state-egl.cpp b/src/gl-state-egl.cpp
@@ -479,8 +479,6 @@ GLStateEGL::getVisualConfig(GLVisualConfig& vc)
 #define GLMARK2_NATIVE_EGL_DISPLAY_ENUM EGL_PLATFORM_WAYLAND_KHR
 #elif  GLMARK2_USE_DRM
 #define GLMARK2_NATIVE_EGL_DISPLAY_ENUM EGL_PLATFORM_GBM_KHR
-#elif  GLMARK2_USE_MIR
-#define GLMARK2_NATIVE_EGL_DISPLAY_ENUM EGL_PLATFORM_MIR_KHR
 #else
 // Platforms not in the above platform enums fall back to eglGetDisplay.
 #define GLMARK2_NATIVE_EGL_DISPLAY_ENUM 0

diff --git a/src/main.cpp b/src/main.cpp
@@ -41,8 +41,6 @@
 #include "native-state-drm.h"
 #elif GLMARK2_USE_GBM
 #include "native-state-gbm.h"
-#elif GLMARK2_USE_MIR
-#include "native-state-mir.h"
 #elif GLMARK2_USE_WAYLAND
 #include "native-state-wayland.h"
 #elif GLMARK2_USE_DISPMANX
@@ -166,8 +164,6 @@ main(int argc, char *argv[])
     NativeStateDRM native_state;
 #elif GLMARK2_USE_GBM
     NativeStateGBM native_state;
-#elif GLMARK2_USE_MIR
-    NativeStateMir native_state;
 #elif GLMARK2_USE_WAYLAND
     NativeStateWayland native_state;
 #elif GLMARK2_USE_DISPMANX

diff --git a/src/native-state-mir.cpp b/src/native-state-mir.cpp
diff --git a/src/native-state-mir.h b/src/native-state-mir.h