wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Henri Verbeet : wined3d: Don' t acquire a context in wined3d_texture_load_drawable().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 7b62dcf0bbda7811a0ca6dab774f74701969441a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b62dcf0bbda7811a0ca6dab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 15:32:48 2019 +0430 wined3d: Don't acquire a context in wined3d_texture_load_drawable(). The one we already have should be fine. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6ae822d..19c2f3b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2547,9 +2547,7 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) { - struct wined3d_texture *restore_texture; struct wined3d_device *device; - unsigned int restore_idx; unsigned int level; RECT r; @@ -2569,13 +2567,6 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, } device = texture->resource.device; - restore_texture = context->current_rt.texture; - restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != texture || restore_idx != sub_resource_idx) - context = context_acquire(device, texture, sub_resource_idx); - else - restore_texture = NULL; - level = sub_resource_idx % texture->level_count; SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), wined3d_texture_get_level_height(texture, level)); @@ -2585,9 +2576,6 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, NULL, WINED3D_TEXF_POINT); - if (restore_texture) - context_restore(context, restore_texture, restore_idx); - return TRUE; }

1 0

Henri Verbeet : wined3d: Acquire front-buffer contexts when blitting to the drawable in texture2d_blt_fbo ().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 96a0a54c5252b80dc30a50e1ec1b89557ef8d623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96a0a54c5252b80dc30a50e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 15:32:47 2019 +0430 wined3d: Acquire front-buffer contexts when blitting to the drawable in texture2d_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3668c61..7d7dd25 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -147,9 +147,9 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const RECT *dst_rect) { struct wined3d_texture *required_texture, *restore_texture; - unsigned int required_idx, restore_idx; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; + unsigned int restore_idx; GLenum gl_filter; GLenum buffer; RECT s, d; @@ -192,26 +192,21 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + /* Acquire a context for the front-buffer, even though we may be blitting + * to/from a back-buffer. Since context_acquire() doesn't take the + * resource location into account, it may consider the back-buffer to be + * offscreen. */ if (src_location == WINED3D_LOCATION_DRAWABLE) - { - required_texture = src_texture; - required_idx = src_sub_resource_idx; - } + required_texture = src_texture->swapchain->front_buffer; else if (dst_location == WINED3D_LOCATION_DRAWABLE) - { - required_texture = dst_texture; - required_idx = dst_sub_resource_idx; - } + required_texture = dst_texture->swapchain->front_buffer; else - { required_texture = NULL; - required_idx = 0; - } restore_texture = context->current_rt.texture; restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != required_texture || restore_idx != required_idx) - context = context_acquire(device, required_texture, required_idx); + if (restore_texture != required_texture) + context = context_acquire(device, required_texture, 0); else restore_texture = NULL;

1 0

Henri Verbeet : wined3d: Acquire a context for the front buffer in swapchain_gl_present().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 57d158622f6c774549ae3da159117dd85339b68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d158622f6c774549ae3da1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 29 15:32:46 2019 +0430 wined3d: Acquire a context for the front buffer in swapchain_gl_present(). Since context_acquire() doesn't take the resource location into account, it may consider the back-buffer to be offscreen, and return an already active context for a different swapchain. This fixes a regression introduced by commit 64d41b3dec0635c56268be64d407ed9bfd8c0695. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bf0c308..8603c8d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -434,7 +434,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_context *context; BOOL render_to_fbo; - context = context_acquire(swapchain->device, back_buffer, 0); + context = context_acquire(swapchain->device, swapchain->front_buffer, 0); context_gl = wined3d_context_gl(context); if (!context_gl->valid) {

1 0

Huw Davies : gdi32: Use the correct type for the final parameter of FSOpenResourceFile().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 0b66af673e82261081f94aa3f02a4992e872062b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b66af673e82261081f94aa3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 10 09:50:17 2019 +0100 gdi32: Use the correct type for the final parameter of FSOpenResourceFile(). This is SInt16 for 32-bit, but int for 64-bit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1162ea7..e3cff25 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -818,7 +818,7 @@ static char *find_cache_dir(void) static char **expand_mac_font(const char *path) { FSRef ref; - SInt16 res_ref; + ResFileRefNum res_ref; OSStatus s; unsigned int idx; const char *out_dir;

1 0

Jeff Smith : d3drm: Return error if setting viewport field-of-view to zero or negative value.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 643e6379a955b875447fd8c245ab47fd8af1f216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=643e6379a955b875447fd8c2… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 10:19:45 2019 -0500 d3drm: Return error if setting viewport field-of-view to zero or negative value. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 8 ++++++++ dlls/d3drm/viewport.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 88f3db8..dbba859 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2157,6 +2157,10 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport_SetField(viewport, 0.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport_SetField(viewport, -1.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2249,6 +2253,10 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport2_SetField(viewport2, 0.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport2_SetField(viewport2, -1.0f); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 430c9d4..c2fa189 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -523,6 +523,9 @@ static HRESULT WINAPI d3drm_viewport2_SetField(IDirect3DRMViewport2 *iface, D3DV TRACE("iface %p, field %.8e.\n", iface, field); + if (field <= 0.0f) + return D3DRMERR_BADVALUE; + viewport->field = field; return D3DRM_OK;

1 0

Jeff Smith : d3drm: Check for NULL pointer in d3drm_viewport2_GetDirect3DViewport().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: d2d64ced538672e278bd39d37c41cced150595dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d64ced538672e278bd39d3… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 10:19:44 2019 -0500 d3drm: Check for NULL pointer in d3drm_viewport2_GetDirect3DViewport(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 67696d5..88f3db8 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2155,6 +2155,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport_GetDevice(viewport, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2245,6 +2247,8 @@ static void test_Viewport(void) ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index d049f37..430c9d4 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -896,6 +896,9 @@ static HRESULT WINAPI d3drm_viewport2_GetDirect3DViewport(IDirect3DRMViewport2 * TRACE("iface %p, viewport %p.\n", iface, viewport); + if (!viewport) + return D3DRMERR_BADVALUE; + if (!viewport_object->d3d_viewport) return D3DRMERR_BADOBJECT;

1 0

Jeff Smith : d3drm: Check for NULL pointer in d3drm_viewport2_GetDevice().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 76a7fe59ebc0f53073715477bed2c7dc31e03e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a7fe59ebc0f53073715477… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Jul 8 10:19:43 2019 -0500 d3drm: Check for NULL pointer in d3drm_viewport2_GetDevice(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8667819..67696d5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2153,6 +2153,8 @@ static void test_Viewport(void) hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMViewport_GetDevice(viewport, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport_Release(viewport); ref4 = get_refcount((IUnknown *)d3drm1); @@ -2241,6 +2243,8 @@ static void test_Viewport(void) hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); IDirect3DRMViewport2_Release(viewport2); ref4 = get_refcount((IUnknown *)d3drm1); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 51174cd..d049f37 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -683,6 +683,9 @@ static HRESULT WINAPI d3drm_viewport2_GetDevice(IDirect3DRMViewport2 *iface, IDi TRACE("iface %p, device %p.\n", iface, device); + if (!device) + return D3DRMERR_BADVALUE; + if (!viewport->device) return D3DRMERR_BADOBJECT; @@ -698,6 +701,9 @@ static HRESULT WINAPI d3drm_viewport1_GetDevice(IDirect3DRMViewport *iface, IDir TRACE("iface %p, device %p.\n\n", iface, device); + if (!device) + return D3DRMERR_BADVALUE; + if (!viewport->device) return D3DRMERR_BADOBJECT;

1 0

Zhiyi Zhang : dxgi: Fix possible null output from d3d11_swapchain_GetFullscreenState.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: e66f8e8c2deda5dfdf22adfe1a98aadcc9d9ad01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e66f8e8c2deda5dfdf22adfe… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 8 22:16:41 2019 +0800 dxgi: Fix possible null output from d3d11_swapchain_GetFullscreenState. When swapchain is created in windowed mode, and then enter fullscreen via Alt+Enter. Calling d3d11_swapchain_GetFullscreenState will return a null output because swapchain->target wasn't initialized. 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/dxgi/swapchain.c | 20 ++++++++++++++++---- dlls/dxgi/tests/dxgi.c | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8dbbfab..caf0863 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -407,22 +407,34 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc swapchain_desc; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); wined3d_mutex_unlock(); - *fullscreen = !swapchain_desc.windowed; } + if (fullscreen) + *fullscreen = !swapchain_desc.windowed; + if (target) { - *target = swapchain->target; - if (*target) + if (!swapchain_desc.windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &swapchain->target))) + return hr; + + *target = swapchain->target; IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } } return S_OK; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 38aeba1..ab33caf 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5456,7 +5456,7 @@ static void test_window_association(void) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); - todo_wine_if(fullscreen) ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i); + ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i); if (output) IDXGIOutput_Release(output);

1 0

Zhiyi Zhang : dxgi/tests: Test output after using Alt+Enter to switch fullscreen.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: facd7cce6d517accdc6e0d74e631beb1f202c78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=facd7cce6d517accdc6e0d74… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 8 22:15:59 2019 +0800 dxgi/tests: Test output after using Alt+Enter to switch fullscreen. 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/dxgi/tests/dxgi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d8176bb..38aeba1 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5306,6 +5306,7 @@ static void test_window_association(void) LONG_PTR original_wndproc, wndproc; IDXGIFactory *factory, *factory2; IDXGISwapChain *swapchain; + IDXGIOutput *output; IDXGIAdapter *adapter; IDXGIDevice *device; HWND hwnd, hwnd2; @@ -5449,14 +5450,18 @@ static void test_window_association(void) PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); flush_events(); - hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + output = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); + todo_wine_if(fullscreen) ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i); + if (output) + IDXGIOutput_Release(output); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); - ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n", + ok(wndproc == original_wndproc, "Test %u: Got unexpected wndproc %#lx, expected %#lx.\n", i, wndproc, original_wndproc); } }

1 0

Józef Kucia : demos: Use 3 swapchain images.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: vkd3d Branch: master Commit: 8bb34406e21b6e24bbab18ddbf52eed6ecb3b780 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8bb34406e21b6e24bbab18d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 17 18:05:15 2019 +0200 demos: Use 3 swapchain images. Mesa drivers increased minImageCount to 3. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/gears.c | 51 ++++++++++++++++++++++++++++----------------------- demos/triangle.c | 2 +- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/demos/gears.c b/demos/gears.c index 72916dc..2045b3c 100644 --- a/demos/gears.c +++ b/demos/gears.c @@ -124,12 +124,12 @@ struct cx_gears struct demo_swapchain *swapchain; ID3D12DescriptorHeap *rtv_heap, *dsv_heap; unsigned int rtv_descriptor_size; - ID3D12Resource *render_targets[2]; - ID3D12CommandAllocator *command_allocator[2]; + ID3D12Resource *render_targets[3]; + ID3D12CommandAllocator *command_allocator[3]; ID3D12RootSignature *root_signature; ID3D12PipelineState *pipeline_state_smooth, *pipeline_state_flat; - ID3D12GraphicsCommandList *command_list[2]; + ID3D12GraphicsCommandList *command_list[3]; ID3D12Resource *ds, *cb, *vb[2], *ib; D3D12_VERTEX_BUFFER_VIEW vbv[2]; D3D12_INDEX_BUFFER_VIEW ibv; @@ -306,8 +306,10 @@ static void cxg_destroy_pipeline(struct cx_gears *cxg) { unsigned int i; - ID3D12CommandAllocator_Release(cxg->command_allocator[1]); - ID3D12CommandAllocator_Release(cxg->command_allocator[0]); + for (i = 0; i < ARRAY_SIZE(cxg->command_allocator); ++i) + { + ID3D12CommandAllocator_Release(cxg->command_allocator[i]); + } for (i = 0; i < ARRAY_SIZE(cxg->render_targets); ++i) { ID3D12Resource_Release(cxg->render_targets[i]); @@ -371,12 +373,12 @@ static void cxg_load_pipeline(struct cx_gears *cxg) &IID_ID3D12DescriptorHeap, (void **)&cxg->dsv_heap); assert(SUCCEEDED(hr)); - hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT, - &IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[0]); - assert(SUCCEEDED(hr)); - hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT, - &IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[1]); - assert(SUCCEEDED(hr)); + for (i = 0; i < ARRAY_SIZE(cxg->command_allocator); ++i) + { + hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[i]); + assert(SUCCEEDED(hr)); + } } static void cxg_fence_destroy(struct cxg_fence *cxg_fence) @@ -387,6 +389,8 @@ static void cxg_fence_destroy(struct cxg_fence *cxg_fence) static void cxg_destroy_assets(struct cx_gears *cxg) { + unsigned int i; + cxg_fence_destroy(&cxg->fence); ID3D12Resource_Release(cxg->ib); ID3D12Resource_Unmap(cxg->vb[1], 0, NULL); @@ -395,8 +399,8 @@ static void cxg_destroy_assets(struct cx_gears *cxg) ID3D12Resource_Unmap(cxg->cb, 0, NULL); ID3D12Resource_Release(cxg->cb); ID3D12Resource_Release(cxg->ds); - ID3D12GraphicsCommandList_Release(cxg->command_list[1]); - ID3D12GraphicsCommandList_Release(cxg->command_list[0]); + for (i = 0; i < ARRAY_SIZE(cxg->command_list); ++i) + ID3D12GraphicsCommandList_Release(cxg->command_list[i]); ID3D12PipelineState_Release(cxg->pipeline_state_smooth); ID3D12PipelineState_Release(cxg->pipeline_state_flat); ID3D12RootSignature_Release(cxg->root_signature); @@ -659,6 +663,7 @@ static void cxg_load_assets(struct cx_gears *cxg) D3D12_HEAP_PROPERTIES heap_desc; D3D12_RANGE read_range = {0, 0}; D3D12_CLEAR_VALUE clear_value; + unsigned int i; HRESULT hr; root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; @@ -709,16 +714,15 @@ static void cxg_load_assets(struct cx_gears *cxg) &IID_ID3D12PipelineState, (void **)&cxg->pipeline_state_smooth); assert(SUCCEEDED(hr)); - hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxg->command_allocator[0], - cxg->pipeline_state_flat, &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[0]); - assert(SUCCEEDED(hr)); - hr = ID3D12GraphicsCommandList_Close(cxg->command_list[0]); - assert(SUCCEEDED(hr)); - hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxg->command_allocator[1], - cxg->pipeline_state_flat, &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[1]); - assert(SUCCEEDED(hr)); - hr = ID3D12GraphicsCommandList_Close(cxg->command_list[1]); - assert(SUCCEEDED(hr)); + for (i = 0; i < ARRAY_SIZE(cxg->command_list); ++i) + { + hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + cxg->command_allocator[i], cxg->pipeline_state_flat, + &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[i]); + assert(SUCCEEDED(hr)); + hr = ID3D12GraphicsCommandList_Close(cxg->command_list[i]); + assert(SUCCEEDED(hr)); + } heap_desc.Type = D3D12_HEAP_TYPE_DEFAULT; heap_desc.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN; @@ -861,6 +865,7 @@ static int cxg_main(void) cxg_load_assets(&cxg); cxg_populate_command_list(&cxg, 0); cxg_populate_command_list(&cxg, 1); + cxg_populate_command_list(&cxg, 2); demo_process_events(&cxg.demo); diff --git a/demos/triangle.c b/demos/triangle.c index 96ad837..bac1cdc 100644 --- a/demos/triangle.c +++ b/demos/triangle.c @@ -73,7 +73,7 @@ struct cx_triangle struct demo_swapchain *swapchain; ID3D12DescriptorHeap *rtv_heap; unsigned int rtv_descriptor_size; - ID3D12Resource *render_targets[2]; + ID3D12Resource *render_targets[3]; ID3D12CommandAllocator *command_allocator; ID3D12RootSignature *root_signature;

1 0

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019