November 2018 - Wine-devel - list.winehq.org

[PATCH vkd3d 1/8] vkd3d: Assign "heap" and "heap_offset" in more appropriate places.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Initializes all fields of struct d3d12_resource in d3d12_resource_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78101a5e1aad..be8bbed54072 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1138,6 +1138,9 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap_flags = heap_flags; resource->initial_state = initial_state; + resource->heap = NULL; + resource->heap_offset = 0; + resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1201,9 +1204,6 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return hr; } - object->heap = NULL; - object->heap_offset = 0; - TRACE("Created committed resource %p.\n", object); *resource = object; @@ -1243,8 +1243,15 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); - if (vr < 0) + if (vr == VK_SUCCESS) + { + resource->heap = heap; + resource->heap_offset = heap_offset; + } + else + { WARN("Failed to bind memory, vr %d.\n", vr); + } return hresult_from_vk_result(vr); } @@ -1266,9 +1273,6 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h return hr; } - object->heap = heap; - object->heap_offset = heap_offset; - TRACE("Created placed resource %p.\n", object); *resource = object; -- 2.18.1

2 1

[PATCH] testbot: Add support for Wine's PARENTSRC.
by Francois Gouget 13 Nov '18

13 Nov '18

This lets the TestBot take into account that modifying the source in a 'PARENTSRC' module affects the code of other modules. This impacts the time it takes to rebuild Wine and the tests to be rerun with the test=module option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 29 ++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 6009264a7d..f72cef5202 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -60,13 +60,14 @@ sub UpdateWineData($) mkdir "$DataDir/latest" if (!-d "$DataDir/latest"); - my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt'`; - return $ErrMessage if ($? != 0); + my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt' && egrep '^PARENTSRC *=' dlls/*/Makefile.in programs/*/Makefile.in >'$DataDir/latest/wine-parentsrc.txt'`; + return $? != 0 ? $ErrMessage : undef; } my $_TimeStamp; my $_WineFiles; my $_TestList; +my $_WineParentDirs; =pod =over 12 @@ -111,6 +112,21 @@ sub _LoadWineFiles() } close($fh); } + + $_WineParentDirs = {}; + $FileName = "$DataDir/latest/wine-parentsrc.txt"; + if (open(my $fh, "<", $FileName)) + { + while (my $Line = <$fh>) + { + if ($Line =~ m~^\w+/([^/]+)/Makefile\.in:PARENTSRC *= *\.\./([^/\s]+)~) + { + my ($Child, $Parent) = ($1, $2); + $_WineParentDirs->{$Parent}->{$Child} = 1; + } + } + close($fh); + } } @@ -212,11 +228,14 @@ sub _HandleFile($$$) } elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) { - my ($Root, $Dir, $File) = ($1, $2, $3); + my ($Root, $PatchedDir, $File) = ($1, $2, $3); - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + foreach my $Dir ($PatchedDir, keys %{$_WineParentDirs->{$PatchedDir} || {}}) + { + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; + } $Impacts->{PatchedModules} = 1; - $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { -- 2.19.1

1 0

[PATCH 2/2] d3d11/tests: Fix crashes with debug layer enabled.
by Józef Kucia 13 Nov '18

13 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 79 ++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 76e0db25cceb..aeba9efe7394 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3755,8 +3755,11 @@ static void test_create_rendertarget_view(void) U1(U(rtv_desc).Buffer).ElementOffset = 0; U2(U(rtv_desc).Buffer).ElementWidth = 64; - hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (!enable_debug_layer) + { + hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)buffer, &rtv_desc, &rtview); @@ -6039,16 +6042,19 @@ static void test_private_data(void) ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - size = 0xdeadbabe; - hr = ID3D11Device_GetPrivateData(device, &test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - ok(size == 0, "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D11Device_GetPrivateData(device, &test_guid, NULL, &ptr); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (!enable_debug_layer) + { + hr = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D11Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + } hr = ID3D11Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -6298,7 +6304,8 @@ static void test_device_context_state(void) tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); - ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + if (!enable_debug_layer) + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -10277,8 +10284,11 @@ static void test_clear_state(void) ok(!tmp_uav[i], "Got unexpected unordered access view %p in slot %u.\n", tmp_uav[i], i); } - ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); - ok(!count, "Got unexpected scissor rect count %u.\n", count); + if (!enable_debug_layer) + { + ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); + ok(!count, "Got unexpected scissor rect count %u.\n", count); + } memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); @@ -13071,23 +13081,27 @@ static void test_check_multisample_quality_levels(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); todo_wine ok(quality_levels == 0xdeadbeef, "Got unexpected quality_levels %u.\n", quality_levels); + if (!enable_debug_layer) + { + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } + quality_levels = 0xdeadbeef; - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &quality_levels); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); @@ -13599,7 +13613,8 @@ static void test_clear_render_target_view_2d(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); + if (!enable_debug_layer) + ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); check_texture_color(texture, expected_color, 1); ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); @@ -13755,7 +13770,8 @@ static void test_clear_depth_stencil_view(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.25f, 0); check_texture_float(depth_texture, 0.25f, 0); - ID3D11DeviceContext_ClearDepthStencilView(context, NULL, D3D11_CLEAR_DEPTH, 1.0f, 0); + if (!enable_debug_layer) + ID3D11DeviceContext_ClearDepthStencilView(context, NULL, D3D11_CLEAR_DEPTH, 1.0f, 0); check_texture_float(depth_texture, 0.25f, 0); ID3D11Texture2D_Release(depth_texture); @@ -21056,10 +21072,13 @@ static void test_render_target_device_mismatch(void) rtv = (ID3D11RenderTargetView *)0xdeadbeef; ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); ok(!rtv, "Got unexpected render target view %p.\n", rtv); - ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); - ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); - ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); - ID3D11RenderTargetView_Release(rtv); + if (!enable_debug_layer) + { + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D11RenderTargetView_Release(rtv); + } rtv = NULL; ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); @@ -27605,7 +27624,7 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D11DeviceContext_RSSetViewports(context, 2, vp); - count = ARRAY_SIZE(vp); + count = enable_debug_layer ? ARRAY_SIZE(vp) - 1 : ARRAY_SIZE(vp); ID3D11DeviceContext_RSGetViewports(context, &count, vp); ok(count == 2, "Unexpected viewport count %d.\n", count); @@ -27688,6 +27707,9 @@ static void test_multiple_viewports(void) SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + if (enable_debug_layer) + goto done; + /* Viewport count exceeding maximum value. */ ID3D11DeviceContext_RSSetViewports(context, 1, vp); @@ -27709,6 +27731,7 @@ static void test_multiple_viewports(void) ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); +done: ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); -- 2.18.1

3 2

[PATCH 1/2] d3d11/tests: Add option to enable debug layer.
by Józef Kucia 13 Nov '18

13 Nov '18

Some tests crashes with the debug layer enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0174289879bc..76e0db25cceb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -38,6 +38,7 @@ #define SWAPCHAIN_FLAG_SHADER_INPUT 0x1 static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; @@ -1346,6 +1347,9 @@ static ID3D11Device *create_device(const struct device_desc *desc) feature_level_count = ARRAY_SIZE(default_feature_level); } + if (enable_debug_layer) + flags |= D3D11_CREATE_DEVICE_DEBUG; + if ((adapter = create_adapter())) { hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, @@ -2037,7 +2041,7 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level) check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */ todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); - check_interface(device, &IID_ID3D11InfoQueue, FALSE, FALSE); /* Non-debug mode. */ + check_interface(device, &IID_ID3D11InfoQueue, enable_debug_layer, FALSE); hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); @@ -28750,7 +28754,9 @@ START_TEST(d3d11) argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); -- 2.18.1

3 2

[PATCH] ieframe/tests: Fix todo_wine for tests that work now.
by Jacek Caban 13 Nov '18

13 Nov '18

Those were fixed by typelib marshaling rewrite. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/tests/ie.c | 3 --- 1 file changed, 3 deletions(-)

1 0

[PATCH] GDI32: accept TTF-fonts without OS2 table
by Wolfgang Walter 13 Nov '18

13 Nov '18

Signed-off-by: Wolfgang Walter <wine(a)stwm.de> --- fonst partially embedded in PDFs often do not contain an OS2 table. Wine did not accept these fonts and uses another fonts as replacement This leads often to completely unreadable documents as the glyp index does not match the one of the choosen replacement font. This patch accepts such fonts and inserts checks where wine assumed that the OS2 table does exist. Regards, -- Wolfgang Walter Studentenwerk München Anstalt des öffentlichen Rechts

2 6

[PATCH 5/5] wined3d: Introduce a separate structure for OpenGL unordered access view information.
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 21 ++++++++------- dlls/wined3d/view.c | 61 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 15 +++++++++-- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e24c834277..4cd46c66c67 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3875,7 +3875,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_unordered_access_view *view; + struct wined3d_unordered_access_view_gl *view_gl; const struct wined3d_format_gl *format_gl; GLuint texture_name; unsigned int i; @@ -3886,7 +3886,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) { - if (!(view = views[i])) + if (!views[i]) { if (shader->reg_maps.uav_resource_info[i].type) WARN("No unordered access view bound at index %u.\n", i); @@ -3894,16 +3894,17 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; } - if (view->gl_view.name) + view_gl = wined3d_unordered_access_view_gl(views[i]); + if (view_gl->gl_view.name) { - texture_name = view->gl_view.name; + texture_name = view_gl->gl_view.name; level = 0; } - else if (view->resource->type != WINED3D_RTYPE_BUFFER) + else if (view_gl->v.resource->type != WINED3D_RTYPE_BUFFER) { - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view->resource)); + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); texture_name = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); - level = view->desc.u.texture.level_idx; + level = view_gl->v.desc.u.texture.level_idx; } else { @@ -3912,12 +3913,12 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; } - format_gl = wined3d_format_gl(view->format); + format_gl = wined3d_format_gl(view_gl->v.format); GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, format_gl->internal)); - if (view->counter_bo) - GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view->counter_bo)); + if (view_gl->counter_bo) + GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo)); } checkGLcall("Bind unordered access views"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5fff7e749e1..0cfadf7329b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -968,26 +968,26 @@ ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access return refcount; } -static void wined3d_unordered_access_view_destroy_object(void *object) +static void wined3d_unordered_access_view_gl_destroy_object(void *object) { - struct wined3d_unordered_access_view *view = object; + struct wined3d_unordered_access_view_gl *view_gl = object; - if (view->gl_view.name || view->counter_bo) + if (view_gl->gl_view.name || view_gl->counter_bo) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - if (view->gl_view.name) - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); - if (view->counter_bo) - GL_EXTCALL(glDeleteBuffers(1, &view->counter_bo)); + if (view_gl->gl_view.name) + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); + if (view_gl->counter_bo) + GL_EXTCALL(glDeleteBuffers(1, &view_gl->counter_bo)); checkGLcall("delete resources"); context_release(context); } - heap_free(view); + heap_free(view_gl); } ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view) @@ -1004,7 +1004,8 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_unordered_access_view_destroy_object, view); + wined3d_cs_destroy_object(device->cs, wined3d_unordered_access_view_gl_destroy_object, + wined3d_unordered_access_view_gl(view)); wined3d_resource_decref(resource); } @@ -1069,15 +1070,16 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) { + struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - if (!view->counter_bo) + if (!view_gl->counter_bo) return; - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view->counter_bo)); + GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view_gl->counter_bo)); GL_EXTCALL(glBufferSubData(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(value), &value)); checkGLcall("set atomic counter"); context_release(context); @@ -1086,16 +1088,17 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) { + struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); struct wined3d_bo_address dst, src; DWORD dst_location; - if (!view->counter_bo) + if (!view_gl->counter_bo) return; dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); dst.addr += offset; - src.buffer_object = view->counter_bo; + src.buffer_object = view_gl->counter_bo; src.addr = NULL; context_copy_bo_address(context, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, @@ -1104,11 +1107,11 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ wined3d_buffer_invalidate_location(buffer, ~dst_location); } -static void wined3d_unordered_access_view_cs_init(void *object) +static void wined3d_unordered_access_view_gl_cs_init(void *object) { - struct wined3d_unordered_access_view *view = object; - struct wined3d_resource *resource = view->resource; - struct wined3d_view_desc *desc = &view->desc; + struct wined3d_unordered_access_view_gl *view_gl = object; + struct wined3d_resource *resource = view_gl->v.resource; + struct wined3d_view_desc *desc = &view_gl->v.desc; const struct wined3d_gl_info *gl_info; gl_info = &resource->device->adapter->gl_info; @@ -1120,12 +1123,12 @@ static void wined3d_unordered_access_view_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); gl_info = context->gl_info; - create_buffer_view(&view->gl_view, context, desc, buffer, view->format); + create_buffer_view(&view_gl->gl_view, context, desc, buffer, view_gl->v.format); if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { static const GLuint initial_value = 0; - GL_EXTCALL(glGenBuffers(1, &view->counter_bo)); - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view->counter_bo)); + GL_EXTCALL(glGenBuffers(1, &view_gl->counter_bo)); + GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view_gl->counter_bo)); GL_EXTCALL(glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); checkGLcall("create atomic counter buffer"); @@ -1144,8 +1147,8 @@ static void wined3d_unordered_access_view_cs_init(void *object) if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture_gl), - desc, texture_gl, view->format); + create_texture_view(&view_gl->gl_view, get_texture_view_target(gl_info, desc, texture_gl), + desc, texture_gl, view_gl->v.format); } } } @@ -1164,8 +1167,6 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces wined3d_resource_incref(view->resource = resource); - wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view); - return WINED3D_OK; } @@ -1173,7 +1174,7 @@ HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_des struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_unordered_access_view **view) { - struct wined3d_unordered_access_view *object; + struct wined3d_unordered_access_view_gl *object; HRESULT hr; TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", @@ -1182,15 +1183,17 @@ HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_des if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_unordered_access_view_init(object, desc, resource, parent, parent_ops))) + if (FAILED(hr = wined3d_unordered_access_view_init(&object->v, desc, resource, parent, parent_ops))) { heap_free(object); WARN("Failed to initialise view, hr %#x.\n", hr); return hr; } + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_gl_cs_init, object); + TRACE("Created unordered access view %p.\n", object); - *view = object; + *view = &object->v; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8b3d55d307..2d2f712d66d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3902,9 +3902,7 @@ struct wined3d_unordered_access_view void *parent; const struct wined3d_parent_ops *parent_ops; - struct wined3d_gl_view gl_view; const struct wined3d_format *format; - GLuint counter_bo; struct wined3d_view_desc desc; }; @@ -3918,6 +3916,19 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) DECLSPEC_HIDDEN; +struct wined3d_unordered_access_view_gl +{ + struct wined3d_unordered_access_view v; + struct wined3d_gl_view gl_view; + GLuint counter_bo; +}; + +static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_view_gl( + struct wined3d_unordered_access_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); +} + struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, -- 2.11.0

2 1

[PATCH 4/5] wined3d: Introduce a separate structure for OpenGL shader resource view information.
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 72 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 16 ++++++++-- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 96572c67247..2e24c834277 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3832,7 +3832,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_bind(view, bind_idx, sampler, context); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context); } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 8cdd214b67b..5fff7e749e1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -672,23 +672,23 @@ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_v return refcount; } -static void wined3d_shader_resource_view_destroy_object(void *object) +static void wined3d_shader_resource_view_gl_destroy_object(void *object) { - struct wined3d_shader_resource_view *view = object; + struct wined3d_shader_resource_view_gl *view_gl = object; - if (view->gl_view.name) + if (view_gl->gl_view.name) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); checkGLcall("glDeleteTextures"); context_release(context); } - heap_free(view); + heap_free(view_gl); } ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) @@ -705,7 +705,8 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); + wined3d_cs_destroy_object(device->cs, wined3d_shader_resource_view_gl_destroy_object, + wined3d_shader_resource_view_gl(view)); wined3d_resource_decref(resource); } @@ -719,18 +720,18 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } -static void wined3d_shader_resource_view_cs_init(void *object) +static void wined3d_shader_resource_view_gl_cs_init(void *object) { - struct wined3d_shader_resource_view *view = object; - struct wined3d_resource *resource = view->resource; + struct wined3d_shader_resource_view_gl *view_gl = object; + struct wined3d_resource *resource = view_gl->v.resource; const struct wined3d_format *view_format; const struct wined3d_gl_info *gl_info; const struct wined3d_view_desc *desc; GLenum view_target; - view_format = view->format; + view_format = view_gl->v.format; gl_info = &resource->device->adapter->gl_info; - desc = &view->desc; + desc = &view_gl->v.desc; if (resource->type == WINED3D_RTYPE_BUFFER) { @@ -738,7 +739,7 @@ static void wined3d_shader_resource_view_cs_init(void *object) struct wined3d_context *context; context = context_acquire(resource->device, NULL, 0); - create_buffer_view(&view->gl_view, context, desc, buffer, view_format); + create_buffer_view(&view_gl->gl_view, context, desc, buffer, view_format); context_release(context); } else @@ -764,11 +765,11 @@ static void wined3d_shader_resource_view_cs_init(void *object) else if (resource->format->typeless_id == view_format->typeless_id && resource_class == view_class) { - create_texture_view(&view->gl_view, view_target, desc, texture_gl, view_format); + create_texture_view(&view_gl->gl_view, view_target, desc, texture_gl, view_format); } else if (wined3d_format_is_depth_view(resource->format->id, view_format->id)) { - create_texture_view(&view->gl_view, view_target, desc, texture_gl, resource->format); + create_texture_view(&view_gl->gl_view, view_target, desc, texture_gl, resource->format); } else { @@ -792,8 +793,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ wined3d_resource_incref(view->resource = resource); - wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); - return WINED3D_OK; } @@ -801,7 +800,7 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view) { - struct wined3d_shader_resource_view *object; + struct wined3d_shader_resource_view_gl *object; HRESULT hr; TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", @@ -810,20 +809,22 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_shader_resource_view_init(object, desc, resource, parent, parent_ops))) + if (FAILED(hr = wined3d_shader_resource_view_init(&object->v, desc, resource, parent, parent_ops))) { heap_free(object); WARN("Failed to initialise view, hr %#x.\n", hr); return hr; } + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_gl_cs_init, object); + TRACE("Created shader resource view %p.\n", object); - *view = object; + *view = &object->v; return WINED3D_OK; } -void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, +void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -831,26 +832,26 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view context_active_texture(context, gl_info, unit); - if (view->gl_view.name) + if (view_gl->gl_view.name) { - context_bind_texture(context, view->gl_view.target, view->gl_view.name); + context_bind_texture(context, view_gl->gl_view.target, view_gl->gl_view.name); wined3d_sampler_bind(sampler, unit, NULL, context); return; } - if (view->resource->type == WINED3D_RTYPE_BUFFER) + if (view_gl->v.resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Buffer shader resources not supported.\n"); return; } - texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view->resource)); + texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context, FALSE); wined3d_sampler_bind(sampler, unit, texture_gl, context); } /* Context activation is done by the caller. */ -static void shader_resource_view_bind_and_dirtify(struct wined3d_shader_resource_view *view, +static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context *context) { if (context->active_texture < ARRAY_SIZE(context->rev_tex_unit_map)) @@ -864,11 +865,12 @@ static void shader_resource_view_bind_and_dirtify(struct wined3d_shader_resource context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - context_bind_texture(context, view->gl_view.target, view->gl_view.name); + context_bind_texture(context, view_gl->gl_view.target, view_gl->gl_view.name); } void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view) { + struct wined3d_shader_resource_view_gl *view_gl = wined3d_shader_resource_view_gl(view); unsigned int i, j, layer_count, level_count, base_level, max_level; const struct wined3d_gl_info *gl_info; struct wined3d_texture_gl *texture_gl; @@ -879,22 +881,22 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * TRACE("view %p.\n", view); - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - layer_count = view->desc.u.texture.layer_count; - level_count = view->desc.u.texture.level_count; - base_level = view->desc.u.texture.level_idx; + layer_count = view_gl->v.desc.u.texture.layer_count; + level_count = view_gl->v.desc.u.texture.level_count; + base_level = view_gl->v.desc.u.texture.level_idx; max_level = base_level + level_count - 1; - texture_gl = wined3d_texture_gl(texture_from_resource(view->resource)); + texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); srgb = !!(texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) wined3d_texture_load_location(&texture_gl->t, i * level_count + base_level, context, location); - if (view->gl_view.name) + if (view_gl->gl_view.name) { - shader_resource_view_bind_and_dirtify(view, context); + shader_resource_view_gl_bind_and_dirtify(view_gl, context); } else { @@ -925,7 +927,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } } - if (!view->gl_view.name) + if (!view_gl->gl_view.name) { gl_tex->base_level = base_level; gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50997e57156..b8b3d55d307 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3872,14 +3872,26 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; - struct wined3d_gl_view gl_view; const struct wined3d_format *format; struct wined3d_view_desc desc; }; void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, unsigned int unit, + +struct wined3d_shader_resource_view_gl +{ + struct wined3d_shader_resource_view v; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_view_gl( + struct wined3d_shader_resource_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_gl, v); +} + +void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view -- 2.11.0

2 1

[PATCH 3/5] wined3d: Introduce a separate structure for OpenGL rendertarget view information.
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 39 ++++++++++++++++++++---------------- dlls/wined3d/view.c | 45 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 13 +++++++++++- 3 files changed, 57 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9784f38c10b..96572c67247 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3053,10 +3053,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win { if (rts[i]) { - context->blit_targets[i].gl_view = rts[i]->gl_view; - context->blit_targets[i].resource = rts[i]->resource; - context->blit_targets[i].sub_resource_idx = rts[i]->sub_resource_idx; - context->blit_targets[i].layer_count = rts[i]->layer_count; + struct wined3d_rendertarget_view_gl *rtv_gl = wined3d_rendertarget_view_gl(rts[i]); + context->blit_targets[i].gl_view = rtv_gl->gl_view; + context->blit_targets[i].resource = rtv_gl->v.resource; + context->blit_targets[i].sub_resource_idx = rtv_gl->v.sub_resource_idx; + context->blit_targets[i].layer_count = rtv_gl->v.layer_count; } if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) rt_mask |= (1u << i); @@ -3064,10 +3065,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (dsv) { - ds_info.gl_view = dsv->gl_view; - ds_info.resource = dsv->resource; - ds_info.sub_resource_idx = dsv->sub_resource_idx; - ds_info.layer_count = dsv->layer_count; + struct wined3d_rendertarget_view_gl *dsv_gl = wined3d_rendertarget_view_gl(dsv); + ds_info.gl_view = dsv_gl->gl_view; + ds_info.resource = dsv_gl->v.resource; + ds_info.sub_resource_idx = dsv_gl->v.sub_resource_idx; + ds_info.layer_count = dsv_gl->v.layer_count; } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, @@ -3189,6 +3191,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } else { + const struct wined3d_rendertarget_view_gl *view_gl; unsigned int i; memset(context->blit_targets, 0, sizeof(context->blit_targets)); @@ -3197,21 +3200,23 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (!fb->render_targets[i]) continue; - context->blit_targets[i].gl_view = fb->render_targets[i]->gl_view; - context->blit_targets[i].resource = fb->render_targets[i]->resource; - context->blit_targets[i].sub_resource_idx = fb->render_targets[i]->sub_resource_idx; - context->blit_targets[i].layer_count = fb->render_targets[i]->layer_count; + view_gl = wined3d_rendertarget_view_gl(fb->render_targets[i]); + context->blit_targets[i].gl_view = view_gl->gl_view; + context->blit_targets[i].resource = view_gl->v.resource; + context->blit_targets[i].sub_resource_idx = view_gl->v.sub_resource_idx; + context->blit_targets[i].layer_count = view_gl->v.layer_count; if (!color_location) - color_location = fb->render_targets[i]->resource->draw_binding; + color_location = view_gl->v.resource->draw_binding; } if (fb->depth_stencil) { - ds_info.gl_view = fb->depth_stencil->gl_view; - ds_info.resource = fb->depth_stencil->resource; - ds_info.sub_resource_idx = fb->depth_stencil->sub_resource_idx; - ds_info.layer_count = fb->depth_stencil->layer_count; + view_gl = wined3d_rendertarget_view_gl(fb->depth_stencil); + ds_info.gl_view = view_gl->gl_view; + ds_info.resource = view_gl->v.resource; + ds_info.sub_resource_idx = view_gl->v.sub_resource_idx; + ds_info.layer_count = view_gl->v.layer_count; } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1e0f49ffd07..8cdd214b67b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -342,25 +342,25 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v return refcount; } -static void wined3d_rendertarget_view_destroy_object(void *object) +static void wined3d_rendertarget_view_gl_destroy_object(void *object) { - struct wined3d_rendertarget_view *view = object; - struct wined3d_device *device = view->resource->device; + struct wined3d_rendertarget_view_gl *view_gl = object; + struct wined3d_device *device = view_gl->v.resource->device; - if (view->gl_view.name) + if (view_gl->gl_view.name) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(device, NULL, 0); gl_info = context->gl_info; - context_gl_resource_released(device, view->gl_view.name, FALSE); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + context_gl_resource_released(device, view_gl->gl_view.name, FALSE); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); checkGLcall("glDeleteTextures"); context_release(context); } - heap_free(view); + heap_free(view_gl); } ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) @@ -377,7 +377,8 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_rendertarget_view_destroy_object, view); + wined3d_cs_destroy_object(device->cs, wined3d_rendertarget_view_gl_destroy_object, + wined3d_rendertarget_view_gl(view)); wined3d_resource_decref(resource); } @@ -525,11 +526,11 @@ void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_v wined3d_view_invalidate_location(view->resource, &view->desc, location); } -static void wined3d_render_target_view_cs_init(void *object) +static void wined3d_render_target_view_gl_cs_init(void *object) { - struct wined3d_rendertarget_view *view = object; - struct wined3d_resource *resource = view->resource; - const struct wined3d_view_desc *desc = &view->desc; + struct wined3d_rendertarget_view_gl *view_gl = object; + struct wined3d_resource *resource = view_gl->v.resource; + const struct wined3d_view_desc *desc = &view_gl->v.desc; if (resource->type == WINED3D_RTYPE_BUFFER) { @@ -545,17 +546,17 @@ static void wined3d_render_target_view_cs_init(void *object) else depth_or_layer_count = texture_gl->t.layer_count; - if (resource->format->id != view->format->id - || (view->layer_count != 1 && view->layer_count != depth_or_layer_count)) + if (resource->format->id != view_gl->v.format->id + || (view_gl->v.layer_count != 1 && view_gl->v.layer_count != depth_or_layer_count)) { GLenum resource_class, view_class; resource_class = wined3d_format_gl(resource->format)->view_class; - view_class = wined3d_format_gl(view->format)->view_class; + view_class = wined3d_format_gl(view_gl->v.format)->view_class; if (resource_class != view_class) { FIXME("Render target view not supported, resource format %s, view format %s.\n", - debug_d3dformat(resource->format->id), debug_d3dformat(view->format->id)); + debug_d3dformat(resource->format->id), debug_d3dformat(view_gl->v.format->id)); return; } if (texture_gl->t.swapchain && texture_gl->t.swapchain->desc.backbuffer_count > 1) @@ -564,7 +565,7 @@ static void wined3d_render_target_view_cs_init(void *object) return; } - create_texture_view(&view->gl_view, texture_gl->target, desc, texture_gl, view->format); + create_texture_view(&view_gl->gl_view, texture_gl->target, desc, texture_gl, view_gl->v.format); } } } @@ -612,8 +613,6 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * wined3d_resource_incref(view->resource = resource); - wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_cs_init, view); - return WINED3D_OK; } @@ -621,7 +620,7 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_view_desc *d struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) { - struct wined3d_rendertarget_view *object; + struct wined3d_rendertarget_view_gl *object; HRESULT hr; TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", @@ -630,15 +629,17 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_view_desc *d if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_rendertarget_view_init(object, desc, resource, parent, parent_ops))) + if (FAILED(hr = wined3d_rendertarget_view_init(&object->v, desc, resource, parent, parent_ops))) { heap_free(object); WARN("Failed to initialise view, hr %#x.\n", hr); return hr; } + wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_gl_cs_init, object); + TRACE("Created render target view %p.\n", object); - *view = object; + *view = &object->v; return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b7ddfce10d..50997e57156 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3830,7 +3830,6 @@ struct wined3d_rendertarget_view void *parent; const struct wined3d_parent_ops *parent_ops; - struct wined3d_gl_view gl_view; const struct wined3d_format *format; unsigned int format_flags; unsigned int sub_resource_idx; @@ -3853,6 +3852,18 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) DECLSPEC_HIDDEN; +struct wined3d_rendertarget_view_gl +{ + struct wined3d_rendertarget_view v; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_rendertarget_view_gl *wined3d_rendertarget_view_gl( + struct wined3d_rendertarget_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_gl, v); +} + struct wined3d_shader_resource_view { LONG refcount; -- 2.11.0

2 1

[PATCH 2/5] d3d8: Do not add map access indiscriminately in d3d8_device_create_surface().
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 885849f671a..476e3e11b78 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1166,8 +1166,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1; -- 2.11.0

2 1