[1/9] wined3d: Make the card selection for binary drivers depend only on gl_renderer like it already is for the mesa drivers and remove the gl_info parameter from the select_card callback. (try2)

[Alexandre Julliard]

Andrei Slăvoiu <andrei.slavoiu at gmail.com> writes:

> ---
>  dlls/wined3d/directx.c | 568 +++++++++++++++++++++++--------------------------
>  1 file changed, 269 insertions(+), 299 deletions(-)

It doesn't work here:

../../../tools/runtest -q -P wine -T ../../.. -M d3d8.dll -p d3d8_test.exe.so device && touch device.ok
err:d3d:resource_init Out of adapter memory
wine: Unhandled page fault on read access to 0x69766574 at address 0x6862ab1c (thread 0009), starting debugger...
Unhandled exception: page fault on read access to 0x69766574 in 32-bit code (0x6862ab1c).
Register dump:
 CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b
 EIP:6862ab1c ESP:0032fa50 EBP:0032fb08 EFLAGS:00010202(  R- --  I   - - - )
 EAX:68667f05 EBX:68678e50 ECX:00000000 EDX:69766564
 ESI:68667f05 EDI:0032fab8
Stack dump:
0x0032fa50:  68667f05 00000000 00000000 0032fab8
0x0032fa60:  00000000 00000000 00000280 000001e0
0x0032fa70:  00000000 00000000 00000000 00000000
0x0032fa80:  00000000 00000000 00060048 68667229
0x0032fa90:  00139670 68668b04 00139688 0032fab8
0x0032faa0:  00000000 00132818 0032fad8 00134650
Backtrace:
=>0 0x6862ab1c test_swapchain+0x28c() [/home/julliard/wine/wine/dlls/d3d8/tests/device.c:261] in d3d8_test (0x0032fb08)
  1 0x68644593 func_device+0x832() [/home/julliard/wine/wine/dlls/d3d8/tests/device.c:6461] in d3d8_test (0x0032fd48)
  2 0x6862a22f main+0x37e(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/d3d8/tests/../../../include/wine/test.h:584] in d3d8_test (0x0032fe18)
  3 0x68667e20 __wine_spec_exe_entry+0x7f(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in d3d8_test (0x0032fe58)
  4 0x7b85f65c call_process_entry+0xb() in kernel32 (0x0032fe78)
  5 0x7b8606a3 start_process+0x62(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1097] in kernel32 (0x0032feb8)
  6 0x7bc7fac0 call_thread_func_wrapper+0xb() in ntdll (0x0032fed8)
  7 0x7bc82a6d call_thread_func+0x7c(entry=0x7b860640, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2630] in ntdll (0x0032ffa8)
  8 0x7bc7fa9e call_thread_entry_point+0x11() in ntdll (0x0032ffc8)
  9 0x7bc53f0e start_process+0x1d(kernel_start=0x7b860640) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2856] in ntdll (0x0032ffe8)
  10 0x680316dd wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000)
  11 0x6803179b wine_switch_to_stack+0x2a(func=0x7bc53ef0, arg=0x7b860640, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xff81e868)
  12 0x7bc59a09 LdrInitializeThunk+0x238(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2910] in ntdll (0xff81e8a8)
  13 0x7b866ea3 __wine_kernel_init+0xa02() [/home/julliard/wine/wine/dlls/kernel32/process.c:1269] in kernel32 (0xff81f7a8)
  14 0x7bc5a903 __wine_process_init+0x192() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3119] in ntdll (0xff81f838)
  15 0x6802ede8 wine_init+0x2c7(argc=0x3, argv=0xff81fd74, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:952] in libwine.so.1 (0xff81f898)
  16 0x7bf00d6c main+0x7b(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:237] in <wine-loader> (0xff81fcd8)
  17 0x682518c5 __libc_start_main+0xf4() in libc.so.6 (0x00000000)
0x6862ab1c test_swapchain+0x28c [/home/julliard/wine/wine/dlls/d3d8/tests/device.c:261] in d3d8_test: call	*0x10(%edx)
261	        hr = IDirect3DSwapChain8_GetBackBuffer(swapchain3, 0, 0, &backbuffer);

-- 
Alexandre Julliard
julliard at winehq.org