RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-20 02:09:52 +00:00
Code Issues Releases Wiki Activity

d3d11: rename d3d11 adapter to DXGI adapter

Browse Source 
There is nothing d3d11 about those adapters.
This commit is contained in:
Kacper Michajłow 2023-11-07 23:35:39 +01:00 committed by sfan5
parent 2a57a6ee4f
commit eb7ba44acf
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
video/out/d3d11/context.c
View File

@ -27,9 +27,9 @@
#include "context.h"
#include "ra_d3d11.h"
static int d3d11_validate_adapter(struct mp_log *log,
const struct m_option *opt,
struct bstr name, const char **value);
static int dxgi_validate_adapter(struct mp_log *log,
const struct m_option *opt,
struct bstr name, const char **value);
struct d3d11_opts {
int feature_level;
@ -62,7 +62,7 @@ const struct m_sub_options d3d11_conf = {
{"d3d11-flip", OPT_BOOL(flip)},
{"d3d11-sync-interval", OPT_INT(sync_interval), M_RANGE(0, 4)},
{"d3d11-adapter", OPT_STRING_VALIDATE(adapter_name,
d3d11_validate_adapter)},
dxgi_validate_adapter)},
{"d3d11-output-format", OPT_CHOICE(output_format,
{"auto", DXGI_FORMAT_UNKNOWN},
{"rgba8", DXGI_FORMAT_R8G8B8A8_UNORM},
@ -109,9 +109,9 @@ struct priv {
int64_t last_submit_qpc;
};
static int d3d11_validate_adapter(struct mp_log *log,
const struct m_option *opt,
struct bstr name, const char **value)
static int dxgi_validate_adapter(struct mp_log *log,
const struct m_option *opt,
struct bstr name, const char **value)
{
struct bstr param = bstr0(*value);
bool help = bstr_equals0(param, "help");
@ -122,12 +122,12 @@ static int d3d11_validate_adapter(struct mp_log *log,
return 0;
}
adapter_matched = mp_d3d11_list_or_verify_adapters(log,
help ? bstr0(NULL) : param,
help ? &listing : NULL);
adapter_matched = mp_dxgi_list_or_verify_adapters(log,
help ? bstr0(NULL) : param,
help ? &listing : NULL);
if (help) {
mp_info(log, "Available D3D11 adapters:\n%.*s",
mp_info(log, "Available DXGI adapters:\n%.*s",
BSTR_P(listing));
talloc_free(listing.start);
return M_OPT_EXIT;

16
video/out/gpu/d3d11_helpers.c
View File

@ -371,9 +371,9 @@ static int get_feature_levels(int max_fl, int min_fl,
return len;
}
static IDXGIAdapter1 *get_d3d11_adapter(struct mp_log *log,
struct bstr requested_adapter_name,
struct bstr *listing)
static IDXGIAdapter1 *get_dxgi_adapter(struct mp_log *log,
struct bstr requested_adapter_name,
struct bstr *listing)
{
HRESULT hr = S_OK;
IDXGIFactory1 *factory;
@ -455,9 +455,9 @@ static HRESULT create_device(struct mp_log *log, IDXGIAdapter1 *adapter,
NULL, flags, levels, levels_len, D3D11_SDK_VERSION, dev, NULL, NULL);
}
bool mp_d3d11_list_or_verify_adapters(struct mp_log *log,
bstr adapter_name,
bstr *listing)
bool mp_dxgi_list_or_verify_adapters(struct mp_log *log,
bstr adapter_name,
bstr *listing)
{
IDXGIAdapter1 *picked_adapter = NULL;
@ -465,7 +465,7 @@ bool mp_d3d11_list_or_verify_adapters(struct mp_log *log,
return false;
}
if ((picked_adapter = get_d3d11_adapter(log, adapter_name, listing))) {
if ((picked_adapter = get_dxgi_adapter(log, adapter_name, listing))) {
SAFE_RELEASE(picked_adapter);
return true;
}
@ -497,7 +497,7 @@ bool mp_d3d11_create_present_device(struct mp_log *log,
goto done;
}
adapter = get_d3d11_adapter(log, bstr0(adapter_name), NULL);
adapter = get_dxgi_adapter(log, bstr0(adapter_name), NULL);
if (adapter_name && !adapter) {
mp_warn(log, "Adapter matching '%s' was not found in the system! "

6
video/out/gpu/d3d11_helpers.h
View File

@ -65,9 +65,9 @@ struct d3d11_device_opts {
char *adapter_name;
};
bool mp_d3d11_list_or_verify_adapters(struct mp_log *log,
bstr adapter_name,
bstr *listing);
bool mp_dxgi_list_or_verify_adapters(struct mp_log *log,
bstr adapter_name,
bstr *listing);
bool mp_d3d11_create_present_device(struct mp_log *log,
struct d3d11_device_opts *opts,