Skip to content

V
vlc-2-2
Commit 9356b6e4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

D3D; fix warnings

parent f5e991c7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
modules/video_output/msw/direct3d.c
View file @ 9356b6e4
...@@ -484,7 +484,7 @@ static int Direct3DCreate(vout_display_t *vd) ...@@ -484,7 +484,7 @@ static int Direct3DCreate(vout_display_t *vd)
LPDIRECT3D9 (WINAPI *OurDirect3DCreate9)(UINT SDKVersion); LPDIRECT3D9 (WINAPI *OurDirect3DCreate9)(UINT SDKVersion);
OurDirect3DCreate9 = OurDirect3DCreate9 =
(void *)GetProcAddress(sys->hd3d9_dll, TEXT("Direct3DCreate9")); (void *)GetProcAddress(sys->hd3d9_dll, "Direct3DCreate9");
if (!OurDirect3DCreate9) { if (!OurDirect3DCreate9) {
msg_Err(vd, "Cannot locate reference to Direct3DCreate9 ABI in DLL"); msg_Err(vd, "Cannot locate reference to Direct3DCreate9 ABI in DLL");
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -609,9 +609,8 @@ static int Direct3DOpen(vout_display_t *vd, video_format_t *fmt) ...@@ -609,9 +609,8 @@ static int Direct3DOpen(vout_display_t *vd, video_format_t *fmt)
// If it is present, override default settings // If it is present, override default settings
for (UINT Adapter=0; Adapter< IDirect3D9_GetAdapterCount(d3dobj); ++Adapter) { for (UINT Adapter=0; Adapter< IDirect3D9_GetAdapterCount(d3dobj); ++Adapter) {
D3DADAPTER_IDENTIFIER9 Identifier; D3DADAPTER_IDENTIFIER9 Identifier;
HRESULT Res; HRESULT Res = IDirect3D9_GetAdapterIdentifier(d3dobj,Adapter,0,&Identifier);
Res = IDirect3D9_GetAdapterIdentifier(d3dobj,Adapter,0,&Identifier); if (SUCCEEDED(Res) && strstr(Identifier.Description,"PerfHUD") != 0) {
if (strstr(Identifier.Description,"PerfHUD") != 0) {
AdapterToUse = Adapter; AdapterToUse = Adapter;
DeviceType = D3DDEVTYPE_REF; DeviceType = D3DDEVTYPE_REF;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment