December 2019 - Wine-Devel - list.winehq.org

[PATCH 1/4] wined3d: Add dirty region members for d3d9 textures.
by Akihiro Sagawa Dec. 7, 2019

Dec. 7, 2019

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/d3d9/texture.c | 9 ++++++++- dlls/wined3d/texture.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ include/wine/wined3d.h | 1 + 4 files changed, 29 insertions(+), 1 deletion(-)

1 0

[PATCH] wtsapi32: Make WTSRegisterSessionNotificationEx's return consistant with WTSRegisterSessionNotification.
by Patrick Hibbs Dec. 7, 2019

Dec. 7, 2019

No point in these returning different values, considering one is a superset of the other. Fix as per Zebediah Figura's bug comment (#12). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c2b817a6ed..026e7f4369 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -385,7 +385,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) { FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); - return FALSE; + return TRUE; } -- 2.24.0

1 0

[PATCH v3 1/3] xmllite/tests: Extract nul-character test from XML declaration test.
by Jeff Smith Dec. 7, 2019

Dec. 7, 2019

The comments in the XML declaration test suggest that it is supposed to be to checking for failure when no element follows the XML declaration. However, the error being tested for is due to a nul character in the input stream. Create a separate test for nul-character errors, and fix the XML declaration test accordingly. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/xmllite/tests/reader.c | 83 +++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 41adad1598..88b9103e1e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -863,7 +863,6 @@ static void test_read_xmldeclaration(void) { {'s','t','a','n','d','a','l','o','n','e',0}, {'y','e','s',0} } }; IXmlReader *reader; - IStream *stream; HRESULT hr; XmlNodeType type; UINT count = 0, len, i; @@ -873,10 +872,7 @@ static void test_read_xmldeclaration(void) hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); - - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + set_input_string(reader, xmldecl_full); hr = IXmlReader_GetAttributeCount(reader, &count); ok(hr == S_OK, "got %08x\n", hr); @@ -968,19 +964,19 @@ static void test_read_xmldeclaration(void) type = XmlNodeType_XmlDeclaration; hr = IXmlReader_Read(reader, &type); - /* newer versions return syntax error here cause document is incomplete, - it makes more sense than invalid char error */ + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Whitespace, "expected XmlNodeType_Whitespace, got %s\n", type_to_str(type)); + + type = XmlNodeType_Whitespace; + hr = IXmlReader_Read(reader, &type); todo_wine { - ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); + ok(hr == WC_E_ROOTELEMENT, "got %08x\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); + TEST_READER_STATE(reader, XmlReadState_Error); } - IStream_Release(stream); /* test short variant */ - stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + set_input_string(reader, xmldecl_short); read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); @@ -1027,14 +1023,66 @@ todo_wine { type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine - ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); + ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); - TEST_READER_POSITION(reader, 1, 41); + + IXmlReader_Release(reader); +} + +static void test_read_nul(void) +{ + static const char xml_empty[] = "<a/>"; + static const char xml_ws[] = "<a/> "; + static const char xml_comment[] = "<a/>"; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = create_stream_on_data(xml_empty, sizeof(xml_empty)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + + type = -1; + hr = IXmlReader_Read(reader, &type); todo_wine - TEST_READER_STATE(reader, XmlReadState_Error); + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); + stream = create_stream_on_data(xml_ws, sizeof(xml_ws)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine { + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); +} + + stream = create_stream_on_data(xml_comment, sizeof(xml_comment)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + read_node(reader, XmlNodeType_Element); + read_node(reader, XmlNodeType_Comment); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine + ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "expected WC_E_SYNTAX, got 0x%08x\n", hr); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); + IXmlReader_Release(reader); } @@ -2672,6 +2720,7 @@ START_TEST(reader) test_read_pending(); test_readvaluechunk(); test_read_xmldeclaration(); + test_read_nul(); test_reader_properties(); test_prefix(); test_namespaceuri(); -- 2.23.0

2 8

[PATCH 1/6] winegstreamer: Use BasePinImpl_QueryInterface().
by Zebediah Figura Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 63 ++++++++--------------------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 78c8e38701a..04fb54915c6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1735,29 +1735,19 @@ static inline struct gstdemux_source *impl_source_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct gstdemux_source, pin.pin.IPin_iface); } -static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - struct gstdemux_source *This = impl_source_from_IPin(iface); + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->seek; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->seek.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - FIXME("No interface for %s!\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) @@ -1847,7 +1837,7 @@ static void free_source_pin(struct gstdemux_source *pin) } static const IPinVtbl GST_OutputPin_Vtbl = { - GSTOutPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect, @@ -1869,6 +1859,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = source_query_interface, .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, @@ -2071,36 +2062,8 @@ static HRESULT WINAPI GSTInPin_NewSegment(IPin *iface, REFERENCE_TIME start, return S_OK; } -static HRESULT WINAPI GSTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) -{ - struct gstdemux *filter = impl_from_sink_IPin(iface); - - TRACE("filter %p, riid %s, ppv %p.\n", filter, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { - return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, &IID_IMediaSeeking, ppv); - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IPinVtbl GST_InputPin_Vtbl = { - GSTInPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, -- 2.23.0

2 6

[PATCH 3/3] wined3d: Unload resources in wined3d_device_uninit_3d().
by Henri Verbeet Dec. 6, 2019

Dec. 6, 2019

Instead of in wined3d_device_delete_opengl_contexts_cs(), which is specific to the GL backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 90c08876505..0ae841d4e35 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -939,7 +939,6 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi void wined3d_device_delete_opengl_contexts_cs(void *object) { - struct wined3d_resource *resource, *cursor; struct wined3d_swapchain_gl *swapchain_gl; struct wined3d_device *device = object; struct wined3d_context_gl *context_gl; @@ -949,12 +948,6 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device_gl = wined3d_device_gl(device); - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); @@ -1106,6 +1099,7 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) void wined3d_device_uninit_3d(struct wined3d_device *device) { BOOL no3d = device->wined3d->flags & WINED3D_NO3D; + struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; unsigned int i; @@ -1145,6 +1139,12 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; @@ -5298,6 +5298,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + if (device->d3d_initialized) device->adapter->adapter_ops->adapter_uninit_3d(device); -- 2.11.0

1 0

[PATCH 2/3] wined3d: Unload texture resources through texture ops.
by Henri Verbeet Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 57 +----------- dlls/wined3d/device.c | 3 +- dlls/wined3d/texture.c | 200 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 125 insertions(+), 138 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3408439660f..a8a8e93c0b2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4746,61 +4746,6 @@ static HRESULT adapter_gl_create_texture(struct wined3d_device *device, return hr; } -static void wined3d_texture_gl_destroy_object(void *object) -{ - struct wined3d_renderbuffer_entry *entry, *entry2; - struct wined3d_texture_gl *texture_gl = object; - struct wined3d_context *context = NULL; - const struct wined3d_gl_info *gl_info; - struct wined3d_device *device; - unsigned int sub_count, i; - GLuint buffer_object; - - TRACE("texture_gl %p.\n", texture_gl); - - sub_count = texture_gl->t.level_count * texture_gl->t.layer_count; - for (i = 0; i < sub_count; ++i) - { - if (!(buffer_object = texture_gl->t.sub_resources[i].buffer_object)) - continue; - - TRACE("Deleting buffer object %u.\n", buffer_object); - - if (!context) - { - context = context_acquire(texture_gl->t.resource.device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - } - - GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); - } - - if (!list_empty(&texture_gl->renderbuffers)) - { - device = texture_gl->t.resource.device; - if (!context) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - } - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - TRACE("Deleting renderbuffer %u.\n", entry->id); - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - heap_free(entry); - } - } - - if (context) - context_release(context); - - wined3d_texture_gl_unload_texture(texture_gl); - - heap_free(texture_gl); -} - static void adapter_gl_destroy_texture(struct wined3d_texture *texture) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); @@ -4820,7 +4765,7 @@ static void adapter_gl_destroy_texture(struct wined3d_texture *texture) texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); wined3d_texture_cleanup(&texture_gl->t); - wined3d_cs_destroy_object(device->cs, wined3d_texture_gl_destroy_object, texture_gl); + wined3d_cs_destroy_object(device->cs, heap_free, texture_gl); if (swapchain_count) wined3d_device_decref(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 98559e4f6c6..90c08876505 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1146,6 +1146,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); device->adapter->adapter_ops->adapter_uninit_3d(device); + device->d3d_initialized = FALSE; if ((view = device->fb.depth_stencil)) { @@ -1170,8 +1171,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) heap_free(device->swapchains); device->swapchains = NULL; - - device->d3d_initialized = FALSE; } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1c315a1dd77..7c9c8298519 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -636,51 +636,6 @@ static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture checkGLcall("allocate immutable storage"); } -void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture_gl) -{ - struct wined3d_device *device = texture_gl->t.resource.device; - const struct wined3d_gl_info *gl_info = NULL; - struct wined3d_context *context = NULL; - - if (texture_gl->t.resource.bind_count) - device_invalidate_state(device, STATE_SAMPLER(texture_gl->t.sampler)); - - if (texture_gl->texture_rgb.name || texture_gl->texture_srgb.name - || texture_gl->rb_multisample || texture_gl->rb_resolved) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - } - - if (texture_gl->texture_rgb.name) - gltexture_delete(device, gl_info, &texture_gl->texture_rgb); - - if (texture_gl->texture_srgb.name) - gltexture_delete(device, gl_info, &texture_gl->texture_srgb); - - if (texture_gl->rb_multisample) - { - TRACE("Deleting multisample renderbuffer %u.\n", texture_gl->rb_multisample); - context_gl_resource_released(device, texture_gl->rb_multisample, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture_gl->rb_multisample); - texture_gl->rb_multisample = 0; - } - - if (texture_gl->rb_resolved) - { - TRACE("Deleting resolved renderbuffer %u.\n", texture_gl->rb_resolved); - context_gl_resource_released(device, texture_gl->rb_resolved, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture_gl->rb_resolved); - texture_gl->rb_resolved = 0; - } - - if (context) context_release(context); - - wined3d_texture_set_dirty(&texture_gl->t); - - resource_unload(&texture_gl->t.resource); -} - void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -1119,12 +1074,14 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) static void wined3d_texture_destroy_object(void *object) { struct wined3d_texture *texture = object; + struct wined3d_resource *resource; struct wined3d_dc_info *dc_info; unsigned int sub_count; unsigned int i; TRACE("texture %p.\n", texture); + resource = &texture->resource; sub_count = texture->level_count * texture->layer_count; if ((dc_info = texture->dc_info)) @@ -1156,12 +1113,14 @@ static void wined3d_texture_destroy_object(void *object) } heap_free(texture->overlay_info); } + + resource->resource_ops->resource_unload(resource); } void wined3d_texture_cleanup(struct wined3d_texture *texture) { - resource_cleanup(&texture->resource); wined3d_cs_destroy_object(texture->resource.device->cs, wined3d_texture_destroy_object, texture); + resource_cleanup(&texture->resource); } static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) @@ -1789,6 +1748,12 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, return texture->texture_ops->texture_prepare_location(texture, sub_resource_idx, context, location); } +static void wined3d_texture_unload_location(struct wined3d_texture *texture, + struct wined3d_context *context, unsigned int location) +{ + texture->texture_ops->texture_unload_location(texture, context, location); +} + static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx) { @@ -2903,10 +2868,79 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, } } +static void wined3d_texture_gl_unload_location(struct wined3d_texture *texture, + struct wined3d_context *context, unsigned int location) +{ + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_renderbuffer_entry *entry, *entry2; + unsigned int i, sub_count; + + TRACE("texture %p, context %p, location %s.\n", texture, context, wined3d_debug_location(location)); + + switch (location) + { + case WINED3D_LOCATION_BUFFER: + sub_count = texture->level_count * texture->layer_count; + for (i = 0; i < sub_count; ++i) + { + if (texture_gl->t.sub_resources[i].buffer_object) + wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl->gl_info); + } + break; + + case WINED3D_LOCATION_TEXTURE_RGB: + if (texture_gl->texture_rgb.name) + gltexture_delete(texture_gl->t.resource.device, context_gl->gl_info, &texture_gl->texture_rgb); + break; + + case WINED3D_LOCATION_TEXTURE_SRGB: + if (texture_gl->texture_srgb.name) + gltexture_delete(texture_gl->t.resource.device, context_gl->gl_info, &texture_gl->texture_srgb); + break; + + case WINED3D_LOCATION_RB_MULTISAMPLE: + if (texture_gl->rb_multisample) + { + TRACE("Deleting multisample renderbuffer %u.\n", texture_gl->rb_multisample); + context_gl_resource_released(texture_gl->t.resource.device, texture_gl->rb_multisample, TRUE); + context_gl->gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture_gl->rb_multisample); + texture_gl->rb_multisample = 0; + } + break; + + case WINED3D_LOCATION_RB_RESOLVED: + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, + struct wined3d_renderbuffer_entry, entry) + { + context_gl_resource_released(texture_gl->t.resource.device, entry->id, TRUE); + context_gl->gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + list_remove(&entry->entry); + heap_free(entry); + } + list_init(&texture_gl->renderbuffers); + texture_gl->current_renderbuffer = NULL; + + if (texture_gl->rb_resolved) + { + TRACE("Deleting resolved renderbuffer %u.\n", texture_gl->rb_resolved); + context_gl_resource_released(texture_gl->t.resource.device, texture_gl->rb_resolved, TRUE); + context_gl->gl_info->fbo_ops.glDeleteRenderbuffers(1, &texture_gl->rb_resolved); + texture_gl->rb_resolved = 0; + } + break; + + default: + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + break; + } +} + static const struct wined3d_texture_ops texture_gl_ops = { wined3d_texture_gl_prepare_location, wined3d_texture_gl_load_location, + wined3d_texture_gl_unload_location, wined3d_texture_gl_upload_data, wined3d_texture_gl_download_data, }; @@ -2936,65 +2970,59 @@ static void texture_resource_preload(struct wined3d_resource *resource) context_release(context); } -static void wined3d_texture_gl_unload(struct wined3d_resource *resource) +static void texture_resource_unload(struct wined3d_resource *resource) { - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(resource)); - UINT sub_count = texture_gl->t.level_count * texture_gl->t.layer_count; - struct wined3d_renderbuffer_entry *entry, *entry2; + struct wined3d_texture *texture = texture_from_resource(resource); struct wined3d_device *device = resource->device; unsigned int location = resource->map_binding; - const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - UINT i; + unsigned int sub_count, i; + + TRACE("resource %p.\n", resource); - TRACE("texture_gl %p.\n", texture_gl); + /* D3D is not initialised, so no GPU locations should currently exist. + * Moreover, we may not be able to acquire a valid context. */ + if (!device->d3d_initialized) + return; context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; if (location == WINED3D_LOCATION_BUFFER) location = WINED3D_LOCATION_SYSMEM; + sub_count = texture->level_count * texture->layer_count; for (i = 0; i < sub_count; ++i) { - struct wined3d_texture_sub_resource *sub_resource = &texture_gl->t.sub_resources[i]; - if (resource->access & WINED3D_RESOURCE_ACCESS_CPU - && wined3d_texture_load_location(&texture_gl->t, i, context, location)) + && wined3d_texture_load_location(texture, i, context, location)) { - wined3d_texture_invalidate_location(&texture_gl->t, i, ~location); + wined3d_texture_invalidate_location(texture, i, ~location); } else { - /* We should only get here on device reset/teardown for implicit - * resources. */ - if (resource->access & WINED3D_RESOURCE_ACCESS_CPU - || resource->type != WINED3D_RTYPE_TEXTURE_2D) + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU) ERR("Discarding %s %p sub-resource %u with resource access %s.\n", debug_d3dresourcetype(resource->type), resource, i, wined3d_debug_resource_access(resource->access)); - wined3d_texture_validate_location(&texture_gl->t, i, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(&texture_gl->t, i, ~WINED3D_LOCATION_DISCARDED); + wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); } - - if (sub_resource->buffer_object) - wined3d_texture_remove_buffer_object(&texture_gl->t, i, gl_info); } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - list_remove(&entry->entry); - heap_free(entry); - } - list_init(&texture_gl->renderbuffers); - texture_gl->current_renderbuffer = NULL; + wined3d_texture_unload_location(texture, context, WINED3D_LOCATION_BUFFER); + wined3d_texture_unload_location(texture, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_unload_location(texture, context, WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_unload_location(texture, context, WINED3D_LOCATION_RB_MULTISAMPLE); + wined3d_texture_unload_location(texture, context, WINED3D_LOCATION_RB_RESOLVED); context_release(context); - wined3d_texture_force_reload(&texture_gl->t); - wined3d_texture_gl_unload_texture(texture_gl); + wined3d_texture_force_reload(texture); + if (texture->resource.bind_count) + device_invalidate_state(device, STATE_SAMPLER(texture->sampler)); + wined3d_texture_set_dirty(texture); + + resource_unload(&texture->resource); } static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, @@ -3177,7 +3205,7 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_incref, texture_resource_decref, texture_resource_preload, - wined3d_texture_gl_unload, + texture_resource_unload, texture_resource_sub_resource_map, texture_resource_sub_resource_unmap, }; @@ -4088,10 +4116,17 @@ static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture, return FALSE; } +static void wined3d_texture_no3d_unload_location(struct wined3d_texture *texture, + struct wined3d_context *context, unsigned int location) +{ + TRACE("texture %p, context %p, location %s.\n", texture, context, wined3d_debug_location(location)); +} + static const struct wined3d_texture_ops wined3d_texture_no3d_ops = { wined3d_texture_no3d_prepare_location, wined3d_texture_no3d_load_location, + wined3d_texture_no3d_unload_location, wined3d_texture_no3d_upload_data, wined3d_texture_no3d_download_data, }; @@ -4158,10 +4193,17 @@ static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, return FALSE; } +static void wined3d_texture_vk_unload_location(struct wined3d_texture *texture, + struct wined3d_context *context, unsigned int location) +{ + FIXME("texture %p, context %p, location %s.\n", texture, context, wined3d_debug_location(location)); +} + static const struct wined3d_texture_ops wined3d_texture_vk_ops = { wined3d_texture_vk_prepare_location, wined3d_texture_vk_load_location, + wined3d_texture_vk_unload_location, wined3d_texture_vk_upload_data, wined3d_texture_vk_download_data, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7d3b709a974..8f9ad1ce856 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3470,6 +3470,8 @@ struct wined3d_texture_ops struct wined3d_context *context, unsigned int location); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location); + void (*texture_unload_location)(struct wined3d_texture *texture, + struct wined3d_context *context, unsigned int location); void (*texture_upload_data)(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, @@ -3745,7 +3747,6 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; struct wined3d_texture_vk { -- 2.11.0

1 0

[PATCH 1/3] wined3d: Unload buffer resources through buffer ops.
by Henri Verbeet Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 17 +----------- dlls/wined3d/buffer.c | 59 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 55 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index eb9965723a2..3408439660f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4699,21 +4699,6 @@ static HRESULT adapter_gl_create_buffer(struct wined3d_device *device, return hr; } -static void wined3d_buffer_gl_destroy_object(void *object) -{ - struct wined3d_buffer_gl *buffer_gl = object; - struct wined3d_context *context; - - if (buffer_gl->b.buffer_object) - { - context = context_acquire(buffer_gl->b.resource.device, NULL, 0); - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); - context_release(context); - } - - heap_free(buffer_gl); -} - static void adapter_gl_destroy_buffer(struct wined3d_buffer *buffer) { struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); @@ -4729,7 +4714,7 @@ static void adapter_gl_destroy_buffer(struct wined3d_buffer *buffer) if (swapchain_count) wined3d_device_incref(device); wined3d_buffer_cleanup(&buffer_gl->b); - wined3d_cs_destroy_object(device->cs, wined3d_buffer_gl_destroy_object, buffer_gl); + wined3d_cs_destroy_object(device->cs, heap_free, buffer_gl); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 95fcdff7ef0..89dab8ebfdd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -139,7 +139,7 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w } /* Context activation is done by the caller. */ -void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, +static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -602,6 +602,12 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return buffer->buffer_ops->buffer_prepare_location(buffer, context, location); } +static void wined3d_buffer_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + buffer->buffer_ops->buffer_unload_location(buffer, context, location); +} + BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { @@ -699,7 +705,7 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, return 0; } -static void buffer_unload(struct wined3d_resource *resource) +static void buffer_resource_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); @@ -713,7 +719,7 @@ static void buffer_unload(struct wined3d_resource *resource) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); + wined3d_buffer_unload_location(buffer, context, WINED3D_LOCATION_BUFFER); buffer_clear_dirty_areas(buffer); context_release(context); @@ -731,21 +737,28 @@ static void buffer_unload(struct wined3d_resource *resource) static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); + buffer_resource_unload(&buffer->resource); } static void wined3d_buffer_destroy_object(void *object) { struct wined3d_buffer *buffer = object; + struct wined3d_context *context; + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL, 0); + wined3d_buffer_unload_location(buffer, context, WINED3D_LOCATION_BUFFER); + context_release(context); + } heap_free(buffer->conversion_map); heap_free(buffer->maps); } void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) { - resource_cleanup(&buffer->resource); wined3d_cs_destroy_object(buffer->resource.device->cs, wined3d_buffer_destroy_object, buffer); + resource_cleanup(&buffer->resource); } ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) @@ -1264,7 +1277,7 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_incref, buffer_resource_decref, buffer_resource_preload, - buffer_unload, + buffer_resource_unload, buffer_resource_sub_resource_map, buffer_resource_sub_resource_unmap, }; @@ -1382,7 +1395,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); - buffer_unload(resource); + buffer_resource_unload(resource); resource_cleanup(resource); wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; @@ -1406,6 +1419,12 @@ static BOOL wined3d_buffer_no3d_prepare_location(struct wined3d_buffer *buffer, return FALSE; } +static void wined3d_buffer_no3d_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); +} + static void wined3d_buffer_no3d_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1421,6 +1440,7 @@ static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, s static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { wined3d_buffer_no3d_prepare_location, + wined3d_buffer_no3d_unload_location, wined3d_buffer_no3d_upload_ranges, wined3d_buffer_no3d_download_ranges, }; @@ -1463,6 +1483,23 @@ static BOOL wined3d_buffer_gl_prepare_location(struct wined3d_buffer *buffer, } } +static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + + switch (location) + { + case WINED3D_LOCATION_BUFFER: + wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); + break; + + default: + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + break; + } +} + /* Context activation is done by the caller. */ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) @@ -1506,6 +1543,7 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_prepare_location, + wined3d_buffer_gl_unload_location, wined3d_buffer_gl_upload_ranges, wined3d_buffer_gl_download_ranges, }; @@ -1542,6 +1580,12 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, } } +static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + FIXME("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); +} + static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1557,6 +1601,7 @@ static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { wined3d_buffer_vk_prepare_location, + wined3d_buffer_vk_unload_location, wined3d_buffer_vk_upload_ranges, wined3d_buffer_vk_download_ranges, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0fc633ad4a5..7d3b709a974 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4120,6 +4120,8 @@ struct wined3d_buffer_ops { BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location); + void (*buffer_unload_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, @@ -4187,8 +4189,6 @@ static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) DECLSPEC_HIDDEN; -void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, - struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH vkd3d] vkd3d: Remove redundant GetCopyableFootprints() resource size alignment checks.
by Conor McCarthy Dec. 6, 2019

Dec. 6, 2019

The alignments are now checked in d3d12_resource_validate_desc(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 89d8aea..f652765 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3497,13 +3497,6 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - if (align(desc->Width, format->block_width) != desc->Width - || align(desc->Height, format->block_height) != desc->Height) - { - WARN("Resource size (%"PRIu64"x%u) not aligned to format block size.\n", desc->Width, desc->Height); - return; - } - offset = 0; total = 0; for (i = 0; i < sub_resource_count; ++i) -- 2.24.0

2 1

[PATCH vkd3d 6/6] vkd3d-shader: Handle VKD3DSPR_GSINSTID in vkd3d_dxbc_compiler_get_register_name().
by Henri Verbeet Dec. 6, 2019

Dec. 6, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 40280eb..3d88be9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2500,6 +2500,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_JOININSTID: snprintf(buffer, buffer_size, "vJoinInstanceId"); break; + case VKD3DSPR_GSINSTID: + snprintf(buffer, buffer_size, "vGSInstanceID"); + break; case VKD3DSPR_PATCHCONST: snprintf(buffer, buffer_size, "vpc%u", idx); break; -- 2.11.0

1 0

[PATCH vkd3d 5/6] vkd3d-shader: Avoid declaring outputs multiple times with incompatible types.
by Henri Verbeet Dec. 6, 2019

Dec. 6, 2019

This would cause CoreValidation-Shader-InterfaceTypeMismatch validation errors from Wine's test_shader_interstage_interface() d3d11 test. This reverts parts of commits 1eb7eca411f71d8dec7cfae5c58c1dff9626a7e0 and 04ec461fb4224e126d271760123bb6d756c06582. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a949e4a..40280eb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4438,8 +4438,13 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { use_private_variable = true; write_mask = VKD3DSP_WRITEMASK_ALL; + entry = rb_get(&compiler->symbol_table, &reg_symbol); } } + else if (!use_private_variable && (entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + } else { if (builtin) @@ -4487,15 +4492,15 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); - - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; } + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; + if (use_private_variable) storage_class = SpvStorageClassPrivate; - if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if (entry) var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; else if (!use_private_variable) var_id = id; -- 2.11.0

1 0