summaryrefslogtreecommitdiffstats
path: root/video/out/d3d11
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2019-09-29 18:21:59 +0300
committerJan Ekström <jeebjp@gmail.com>2019-09-29 19:39:26 +0300
commit1f76e6914596868e53b5ed4f50353ba44177ab4c (patch)
tree6fa257365f34b0aae5607a078c0fbe3cddf05112 /video/out/d3d11
parentbca6e14702998220b5744546f17da5e3e75d2f06 (diff)
downloadmpv-1f76e6914596868e53b5ed4f50353ba44177ab4c.tar.bz2
mpv-1f76e6914596868e53b5ed4f50353ba44177ab4c.tar.xz
vo_gpu/d3d11: add adapter name validation and listing with "help"
Not the prettiest way to get it done, but seems to work.
Diffstat (limited to 'video/out/d3d11')
-rw-r--r--video/out/d3d11/context.c37
1 files changed, 36 insertions, 1 deletions
diff --git a/video/out/d3d11/context.c b/video/out/d3d11/context.c
index 8359f7ffd2..17bcdcc1f6 100644
--- a/video/out/d3d11/context.c
+++ b/video/out/d3d11/context.c
@@ -26,6 +26,10 @@
#include "video/out/w32_common.h"
#include "ra_d3d11.h"
+static int d3d11_validate_adapter(struct mp_log *log,
+ const struct m_option *opt,
+ struct bstr name, struct bstr param);
+
struct d3d11_opts {
int feature_level;
int warp;
@@ -53,7 +57,8 @@ const struct m_sub_options d3d11_conf = {
{"9_1", D3D_FEATURE_LEVEL_9_1})),
OPT_FLAG("d3d11-flip", flip, 0),
OPT_INTRANGE("d3d11-sync-interval", sync_interval, 0, 0, 4),
- OPT_STRING("d3d11-adapter", adapter_name, 0),
+ OPT_STRING_VALIDATE("d3d11-adapter", adapter_name, 0,
+ d3d11_validate_adapter),
{0}
},
.defaults = &(const struct d3d11_opts) {
@@ -80,6 +85,36 @@ struct priv {
int64_t last_submit_qpc;
};
+static int d3d11_validate_adapter(struct mp_log *log,
+ const struct m_option *opt,
+ struct bstr name, struct bstr param)
+{
+ bool help = bstr_equals0(param, "help");
+ bool adapter_matched = false;
+ struct bstr listing = { 0 };
+
+ if (bstr_equals0(param, "")) {
+ return 0;
+ }
+
+ adapter_matched = mp_d3d11_list_or_verify_adapters(log,
+ help ? NULL : &param,
+ help ? &listing : NULL);
+
+ if (help) {
+ mp_info(log, "Available D3D11 adapters:\n%.*s",
+ BSTR_P(listing));
+ talloc_free(listing.start);
+ return M_OPT_EXIT;
+ }
+
+ if (!adapter_matched) {
+ mp_err(log, "No adapter with name '%.*s'!\n", BSTR_P(param));
+ }
+
+ return adapter_matched ? 0 : M_OPT_INVALID;
+}
+
static struct ra_tex *get_backbuffer(struct ra_ctx *ctx)
{
struct priv *p = ctx->priv;