Mercurial > mplayer.hg

comparison libvo/vo_directx.c @ 34091:954f6d044371

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix DirectX compilation error. In DirectX 8 and 9, member dwBackBufferCount is in an anonymous union. MinGW complains: error: unknown field 'dwBackBufferCount' specified in initializer
author ib
date Thu, 06 Oct 2011 10:04:40 +0000
parents 240ab28c7628
children 3f409c370881
comparison
equal deleted inserted replaced
34090:de2fbf5e5a4e 34091:954f6d044371
227 .dwSize = sizeof(ddsdOverlay), 227 .dwSize = sizeof(ddsdOverlay),
228 .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_VIDEOMEMORY, 228 .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_VIDEOMEMORY,
229 .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_BACKBUFFERCOUNT | DDSD_PIXELFORMAT, 229 .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_BACKBUFFERCOUNT | DDSD_PIXELFORMAT,
230 .dwWidth = image_width, 230 .dwWidth = image_width,
231 .dwHeight = image_height, 231 .dwHeight = image_height,
232 .dwBackBufferCount = 2,
233 }; 232 };
234 uint32_t i = 0; 233 uint32_t i = 0;
234 ddsdOverlay.dwBackBufferCount = 2;
235 while (i < NUM_FORMATS && imgfmt != g_ddpf[i].img_format) 235 while (i < NUM_FORMATS && imgfmt != g_ddpf[i].img_format)
236 i++; 236 i++;
237 if (!g_lpdd || !g_lpddsPrimary || i == NUM_FORMATS) 237 if (!g_lpdd || !g_lpddsPrimary || i == NUM_FORMATS)
238 return 1; 238 return 1;
239 //cleanup 239 //cleanup
626 .dwSize = sizeof(ddsdOverlay), 626 .dwSize = sizeof(ddsdOverlay),
627 .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY, 627 .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY,
628 .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT, 628 .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT,
629 .dwWidth = 300, 629 .dwWidth = 300,
630 .dwHeight = 280, 630 .dwHeight = 280,
631 .dwBackBufferCount = 0,
632 }; 631 };
633 uint32_t i; 632 uint32_t i;
634 uint32_t formatcount = 0; 633 uint32_t formatcount = 0;
634 ddsdOverlay.dwBackBufferCount = 0;
635 //get driver caps to determine overlay support 635 //get driver caps to determine overlay support
636 ddrval = g_lpdd->lpVtbl->GetCaps(g_lpdd, &capsDrv, NULL); 636 ddrval = g_lpdd->lpVtbl->GetCaps(g_lpdd, &capsDrv, NULL);
637 if (FAILED(ddrval)) { 637 if (FAILED(ddrval)) {
638 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>failed getting ddrawcaps\n"); 638 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>failed getting ddrawcaps\n");
639 return 1; 639 return 1;