3 files changed, 35 insertions, 36 deletions
diff --git a/video/out/opengl/context.c b/video/out/opengl/context.c
index 07fa183acc..781352da34 100644
--- a/video/out/opengl/context.c
+++ b/video/out/opengl/context.c
@@ -59,21 +59,20 @@ struct opengl_opts {
 #define OPT_BASE_STRUCT struct opengl_opts
 const struct m_sub_options opengl_conf = {
     .opts = (const struct m_option[]) {
-        OPT_FLAG("opengl-glfinish", use_glfinish, 0),
-        OPT_FLAG("opengl-waitvsync", waitvsync, 0),
-        OPT_INT("opengl-swapinterval", swapinterval, 0),
-        OPT_INT("opengl-check-pattern-a", vsync_pattern[0], 0),
-        OPT_INT("opengl-check-pattern-b", vsync_pattern[1], 0),
-        OPT_INT("opengl-restrict", restrict_version, 0),
-        OPT_CHOICE("opengl-es", gles_mode, 0,
-                ({"auto", GLES_AUTO}, {"yes", GLES_YES}, {"no", GLES_NO})),
-        OPT_CHOICE("opengl-early-flush", early_flush, 0,
-                ({"no", FLUSH_NO}, {"yes", FLUSH_YES}, {"auto", FLUSH_AUTO})),
-
-        OPT_REPLACED("opengl-debug", "gpu-debug"),
-        OPT_REPLACED("opengl-sw", "gpu-sw"),
-        OPT_REPLACED("opengl-vsync-fences", "swapchain-depth"),
-        OPT_REPLACED("opengl-backend", "gpu-context"),
+        {"opengl-glfinish", OPT_FLAG(use_glfinish)},
+        {"opengl-waitvsync", OPT_FLAG(waitvsync)},
+        {"opengl-swapinterval", OPT_INT(swapinterval)},
+        {"opengl-check-pattern-a", OPT_INT(vsync_pattern[0])},
+        {"opengl-check-pattern-b", OPT_INT(vsync_pattern[1])},
+        {"opengl-restrict", OPT_INT(restrict_version)},
+        {"opengl-es", OPT_CHOICE(gles_mode,
+            {"auto", GLES_AUTO}, {"yes", GLES_YES}, {"no", GLES_NO})},
+        {"opengl-early-flush", OPT_CHOICE(early_flush,
+            {"no", FLUSH_NO}, {"yes", FLUSH_YES}, {"auto", FLUSH_AUTO})},
+        {"opengl-debug", OPT_REPLACED("gpu-debug")},
+        {"opengl-sw", OPT_REPLACED("gpu-sw")},
+        {"opengl-vsync-fences", OPT_REPLACED("swapchain-depth")},
+        {"opengl-backend", OPT_REPLACED("gpu-context")},
         {0},
     },
     .defaults = &(const struct opengl_opts) {
diff --git a/video/out/opengl/context_angle.c b/video/out/opengl/context_angle.c
index 76d104e9b9..2784026d1d 100644
--- a/video/out/opengl/context_angle.c
+++ b/video/out/opengl/context_angle.c
@@ -59,26 +59,26 @@ struct angle_opts {
 #define OPT_BASE_STRUCT struct angle_opts
 const struct m_sub_options angle_conf = {
     .opts = (const struct m_option[]) {
-        OPT_CHOICE("angle-renderer", renderer, 0,
-                   ({"auto", RENDERER_AUTO},
-                    {"d3d9", RENDERER_D3D9},
-                    {"d3d11", RENDERER_D3D11})),
-        OPT_CHOICE("angle-d3d11-warp", d3d11_warp, 0,
-                   ({"auto", -1},
-                    {"no", 0},
-                    {"yes", 1})),
-        OPT_CHOICE("angle-d3d11-feature-level", d3d11_feature_level, 0,
-                   ({"11_0", D3D_FEATURE_LEVEL_11_0},
-                    {"10_1", D3D_FEATURE_LEVEL_10_1},
-                    {"10_0", D3D_FEATURE_LEVEL_10_0},
-                    {"9_3", D3D_FEATURE_LEVEL_9_3})),
-        OPT_CHOICE("angle-egl-windowing", egl_windowing, 0,
-                   ({"auto", -1},
-                    {"no", 0},
-                    {"yes", 1})),
-        OPT_FLAG("angle-flip", flip, 0),
-        OPT_REPLACED("angle-max-frame-latency", "swapchain-depth"),
-        OPT_REMOVED("angle-swapchain-length", "controlled by --swapchain-depth"),
+        {"angle-renderer", OPT_CHOICE(renderer,
+            {"auto", RENDERER_AUTO},
+            {"d3d9", RENDERER_D3D9},
+            {"d3d11", RENDERER_D3D11})},
+        {"angle-d3d11-warp", OPT_CHOICE(d3d11_warp,
+            {"auto", -1},
+            {"no", 0},
+            {"yes", 1})},
+        {"angle-d3d11-feature-level", OPT_CHOICE(d3d11_feature_level,
+            {"11_0", D3D_FEATURE_LEVEL_11_0},
+            {"10_1", D3D_FEATURE_LEVEL_10_1},
+            {"10_0", D3D_FEATURE_LEVEL_10_0},
+            {"9_3", D3D_FEATURE_LEVEL_9_3})},
+        {"angle-egl-windowing", OPT_CHOICE(egl_windowing,
+            {"auto", -1},
+            {"no", 0},
+            {"yes", 1})},
+        {"angle-flip", OPT_FLAG(flip)},
+        {"angle-max-frame-latency", OPT_REPLACED("swapchain-depth")},
+        {"angle-swapchain-length", OPT_REMOVED("controlled by --swapchain-depth")},
         {0}
     },
     .defaults = &(const struct angle_opts) {
diff --git a/video/out/opengl/context_cocoa.c b/video/out/opengl/context_cocoa.c
index d0fcd63d62..b7cab8e718 100644
--- a/video/out/opengl/context_cocoa.c
+++ b/video/out/opengl/context_cocoa.c
@@ -28,7 +28,7 @@ struct cocoa_opts {
 #define OPT_BASE_STRUCT struct cocoa_opts
 const struct m_sub_options cocoa_conf = {
     .opts = (const struct m_option[]) {
-        OPT_REPLACED("cocoa-force-dedicated-gpu", "macos-force-dedicated-gpu"),
+        {"cocoa-force-dedicated-gpu", OPT_REPLACED("macos-force-dedicated-gpu")},
         {0}
     },
     .size = sizeof(struct cocoa_opts),