vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Wed Jan 17 11:20:02 2018 +0100| [61891b74a9ce077415c7755e1be4c1af29f2d305] | committer: Jean-Baptiste Kempf
d3d11_fmt: rename wdmm_version to wddm_version (cherry picked from commit 87c28704db636e98d410d26989be505cd982a95c) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=61891b74a9ce077415c7755e1be4c1af29f2d305 --- modules/codec/avcodec/d3d11va.c | 2 +- modules/video_chroma/d3d11_fmt.c | 2 +- modules/video_chroma/d3d11_fmt.h | 14 +++++++------- modules/video_output/win32/direct3d11.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c index 0fb16efb8e..dc8e5c2766 100644 --- a/modules/codec/avcodec/d3d11va.c +++ b/modules/codec/avcodec/d3d11va.c @@ -531,7 +531,7 @@ static bool CanUseIntelHEVC(vlc_va_t *va) { vlc_va_sys_t *sys = va->sys; /* it should be OK starting after driver 20.19.15.4835 */ - struct wdmm_version WDMM = { + struct wddm_version WDMM = { .wddm = 20, .d3d_features = 19, .revision = 15, diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c index 5f9a5b911a..c39e6c8a61 100644 --- a/modules/video_chroma/d3d11_fmt.c +++ b/modules/video_chroma/d3d11_fmt.c @@ -305,7 +305,7 @@ static HKEY GetAdapterRegistry(DXGI_ADAPTER_DESC *adapterDesc) } #endif -int D3D11CheckDriverVersion(ID3D11Device *d3ddev, UINT vendorId, const struct wdmm_version *min_ver) +int D3D11CheckDriverVersion(ID3D11Device *d3ddev, UINT vendorId, const struct wddm_version *min_ver) { IDXGIAdapter *pAdapter = D3D11DeviceAdapter(d3ddev); if (!pAdapter) diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h index d8687421eb..d9cbad85f3 100644 --- a/modules/video_chroma/d3d11_fmt.h +++ b/modules/video_chroma/d3d11_fmt.h @@ -29,6 +29,12 @@ DEFINE_GUID(GUID_CONTEXT_MUTEX, 0x472e8835, 0x3f8e, 0x4f93, 0xa0, 0xcb, 0x25, 0x79, 0x77, 0x6c, 0xed, 0x86); +/* see https://msdn.microsoft.com/windows/hardware/commercialize/design/compatibility/device-graphics */ +struct wddm_version +{ + int wddm, d3d_features, revision, build; +}; + typedef struct { ID3D11Device *d3ddevice; /* D3D device */ @@ -97,17 +103,11 @@ int D3D11_Create(vlc_object_t *, d3d11_handle_t *); void D3D11_Destroy(d3d11_handle_t *); -/* see https://msdn.microsoft.com/windows/hardware/commercialize/design/compatibility/device-graphics */ -struct wdmm_version -{ - int wddm, d3d_features, revision, build; -}; - bool isXboxHardware(ID3D11Device *d3ddev); bool isNvidiaHardware(ID3D11Device *d3ddev); IDXGIAdapter *D3D11DeviceAdapter(ID3D11Device *d3ddev); int D3D11CheckDriverVersion(ID3D11Device *d3ddev, UINT vendorId, - const struct wdmm_version *min_ver); + const struct wddm_version *min_ver); static inline bool DeviceSupportsFormat(ID3D11Device *d3ddevice, DXGI_FORMAT format, UINT supportFlags) diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index d4ff4a53ed..0305392e45 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -1973,7 +1973,7 @@ static bool CanUseTextureArray(vout_display_t *vd) (void) vd; return false; #else - struct wdmm_version WDDM = { + struct wddm_version WDDM = { .wddm = 22, .d3d_features = 19, .revision = 162, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
