Module: wine Branch: master Commit: 597433ab6bb0263ed5e1f68b5cffe9fb5a4a16cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=597433ab6bb0263ed5e1f68b5... Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 8 15:57:51 2020 +0800 wined3d: Call wined3d_adapter_init() before initialising any adapter field. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 456cb9ad12..b5de589d33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2914,10 +2914,6 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); - adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); - if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) { heap_free(adapter); @@ -2930,6 +2926,10 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return NULL; } + wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); + adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->misc_state_template = misc_state_template_no3d;