Skip to content

Commit b48eda4

Browse files
committed
NativeStateMir: Remove Mir/mirclient support
The mirclient API was deprecated a long time ago and removed from Mir 2.0 in favor of Wayland.
1 parent 08ea092 commit b48eda4

File tree

7 files changed

+2
-350
lines changed

7 files changed

+2
-350
lines changed

INSTALL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ WAF build system
2020
----------------
2121

2222
glmark2 previously used the WAF build system, and the builds for some flavors
23-
(dispmanx, win32, mir) have not been ported to the meson build system. For such
23+
(dispmanx, win32) have not been ported to the meson build system. For such
2424
cases follow the instructions below.
2525

2626
To configure glmark2 use:
2727

28-
$ ./waf configure --with-flavors=dispmanx-glesv2,win32-gl,win32-glesv2,mir-gl,mir-glesv2... [--data-path=DATA_PATH --prefix=PREFIX]
28+
$ ./waf configure --with-flavors=dispmanx-glesv2,win32-gl,win32-glesv2... [--data-path=DATA_PATH --prefix=PREFIX]
2929

3030
To build use:
3131

src/gl-state-egl.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,6 @@ GLStateEGL::getVisualConfig(GLVisualConfig& vc)
479479
#define GLMARK2_NATIVE_EGL_DISPLAY_ENUM EGL_PLATFORM_WAYLAND_KHR
480480
#elif GLMARK2_USE_DRM
481481
#define GLMARK2_NATIVE_EGL_DISPLAY_ENUM EGL_PLATFORM_GBM_KHR
482-
#elif GLMARK2_USE_MIR
483-
#define GLMARK2_NATIVE_EGL_DISPLAY_ENUM EGL_PLATFORM_MIR_KHR
484482
#else
485483
// Platforms not in the above platform enums fall back to eglGetDisplay.
486484
#define GLMARK2_NATIVE_EGL_DISPLAY_ENUM 0

src/main.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
#include "native-state-drm.h"
4242
#elif GLMARK2_USE_GBM
4343
#include "native-state-gbm.h"
44-
#elif GLMARK2_USE_MIR
45-
#include "native-state-mir.h"
4644
#elif GLMARK2_USE_WAYLAND
4745
#include "native-state-wayland.h"
4846
#elif GLMARK2_USE_DISPMANX
@@ -166,8 +164,6 @@ main(int argc, char *argv[])
166164
NativeStateDRM native_state;
167165
#elif GLMARK2_USE_GBM
168166
NativeStateGBM native_state;
169-
#elif GLMARK2_USE_MIR
170-
NativeStateMir native_state;
171167
#elif GLMARK2_USE_WAYLAND
172168
NativeStateWayland native_state;
173169
#elif GLMARK2_USE_DISPMANX

src/native-state-mir.cpp

Lines changed: 0 additions & 274 deletions
This file was deleted.

src/native-state-mir.h

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)