June 2019 - Wine-Commits - list.winehq.org

Zhiyi Zhang : user32: Implement EnumDisplayDevicesW().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: a985771f83b767a47c1b246b9cbe2151d2725e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a985771f83b767a47c1b246b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:08:52 2019 +0800 user32: Implement EnumDisplayDevicesW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 202 +++++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 8 +- 2 files changed, 205 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a985771f83b767a47c1b…

1 0

Zhiyi Zhang : winex11.drv: Handle display device changes.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 7f57cda707f882de8085367c46df40b81e58a70a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f57cda707f882de8085367c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:07:46 2019 +0800 winex11.drv: Handle display device changes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/display.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d478cbd..a0495c4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 99a70be..ce2c568 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -339,7 +339,7 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -void X11DRV_DisplayDevices_Init(void) +void X11DRV_DisplayDevices_Init(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; @@ -366,7 +366,7 @@ void X11DRV_DisplayDevices_Init(void) } /* Avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) goto done; TRACE("via %s\n", wine_dbgstr_a(handler.name)); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8031beb..ed5e268 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -736,7 +736,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; -extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6947874..21807af 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,7 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); - X11DRV_DisplayDevices_Init(); + X11DRV_DisplayDevices_Init(FALSE); return TRUE; }

1 0

Józef Kucia : vkd3d: Use FIXME_ONCE() for AntialiasedLineEnable.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: vkd3d Branch: master Commit: a8c0fbaa6d4620c21829698d2e2d398806b0cdde URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a8c0fbaa6d4620c21829698… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:36 2019 +0200 vkd3d: Use FIXME_ONCE() for AntialiasedLineEnable. 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> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 64be72d..7946680 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1722,7 +1722,7 @@ static void rs_desc_from_d3d12(VkPipelineRasterizationStateCreateInfo *vk_desc, if (d3d12_desc->MultisampleEnable) FIXME_ONCE("Ignoring MultisampleEnable %#x.\n", d3d12_desc->MultisampleEnable); if (d3d12_desc->AntialiasedLineEnable) - FIXME("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); + FIXME_ONCE("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); if (d3d12_desc->ForcedSampleCount) FIXME("Ignoring ForcedSampleCount %#x.\n", d3d12_desc->ForcedSampleCount); if (d3d12_desc->ConservativeRaster)

1 0

Józef Kucia : vkd3d: Avoid busy-waiting in fence worker thread.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: vkd3d Branch: master Commit: 206fd23afea6793cce0aba05a680607fc6f2d628 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=206fd23afea6793cce0aba0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:35 2019 +0200 vkd3d: Avoid busy-waiting in fence worker thread. This might delay updating a d3d12_fence when a fence enqueued later than other fences is signaled before them. On the other hand, it significantly reduces CPU usage. I haven't found a program negatively impacted by this change so far. 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> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7634e71..75556f5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -362,7 +362,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) return; vr = VK_CALL(vkWaitForFences(device->vk_device, - worker->fence_count, worker->vk_fences, VK_FALSE, 0)); + worker->fence_count, worker->vk_fences, VK_FALSE, ~(uint64_t)0)); if (vr == VK_TIMEOUT) return; if (vr != VK_SUCCESS)

1 0

Józef Kucia : vkd3d: Avoid holding mutex while waiting for fences.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: vkd3d Branch: master Commit: 0baf0302d1b342e73a61f6ec051a6fd700bbc09d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0baf0302d1b342e73a61f6e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:34 2019 +0200 vkd3d: Avoid holding mutex while waiting for fences. We maintain separate arrays for enqueued fences and fences owned by the fence worker thread. 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> --- include/private/vkd3d_common.h | 10 ++- libs/vkd3d/command.c | 164 ++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 15 ++++ 3 files changed, 137 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0baf0302d1b342e73a6…

1 0

Józef Kucia : tests: Add bug_if() for Nvidia tessellation shader bugs.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: vkd3d Branch: master Commit: 18442763f1683ac7c47f17588b0632c3b34ac1f2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=18442763f1683ac7c47f175… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:33 2019 +0200 tests: Add bug_if() for Nvidia tessellation shader bugs. 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> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a57a045..81fb26a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27042,6 +27042,7 @@ static void test_line_tessellation(void) data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 1]; + bug_if(is_nvidia_device(context.device)) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);

1 0

Alexandre Julliard : imagehlp/tests: Remove a workaround for Win95.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: dffa0b021075f0fc3088fb90f5be263fef26d250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dffa0b021075f0fc3088fb90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 23:34:48 2019 +0200 imagehlp/tests: Remove a workaround for Win95. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/integrity.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index a5648ad..3b85c6a 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -407,15 +407,6 @@ START_TEST(integrity) } file_size_orig = get_file_size(); - /* - * Align file_size_orig to an 8-byte boundary. This avoids tests failures where - * the original dll is not correctly aligned (but when written to it will be). - */ - if (file_size_orig % 8 != 0) - { - skip("We need to align to an 8-byte boundary\n"); - file_size_orig = (file_size_orig + 7) & ~7; - } pImageAddCertificate = (void *) GetProcAddress(hImageHlp, "ImageAddCertificate"); pImageEnumerateCertificates = (void *) GetProcAddress(hImageHlp, "ImageEnumerateCertificates");

1 0

Henri Verbeet : wined3d: Upload texture data through the texture ops in surface_convert_format().
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: 2d36c1c25326676d8ad7a0d53ef66f03a2408584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d36c1c25326676d8ad7a0d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 12 16:17:35 2019 +0430 wined3d: Upload texture data through the texture ops in surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 291ae84..8d67e52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -694,9 +694,9 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr TRACE("Using upload conversion.\n"); wined3d_texture_prepare_location(dst_texture, 0, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); - wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box, - wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&src_data), + src_format, &src_box, src_row_pitch, src_slice_pitch, + dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB, 0, 0, 0); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_prepare_texture().
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: ed9a6a2d6711d7c4739bb27bd9112051ad2be222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9a6a2d6711d7c4739bb27b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 12 16:17:32 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 ++-- dlls/wined3d/surface.c | 11 +++++---- dlls/wined3d/texture.c | 54 +++++++++++++++++++++++------------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 5 files changed, 41 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9a6a2d6711d7c4739b…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_unmap_bo_address().
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: e3d28cd45d4e9a3fadb687980bf9acc2d31185d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d28cd45d4e9a3fadb68798… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 12 16:17:31 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 12 ++++++------ dlls/wined3d/texture.c | 14 +++++++++++--- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be24baf..76b5858 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2618,16 +2618,15 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return memory; } -void context_unmap_bo_address(struct wined3d_context *context, +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, GLenum binding) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); wined3d_context_gl_bind_bo(context_gl, binding, 0); @@ -2660,8 +2659,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, memcpy(dst_ptr, src_ptr, size); - context_unmap_bo_address(&context_gl->c, dst, dst_binding); - context_unmap_bo_address(&context_gl->c, src, src_binding); + wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding); + wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding); } } else if (!dst->buffer_object && src->buffer_object) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5e28c46..0b6104d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -684,8 +684,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); wined3d_texture_invalidate_location(dst_texture, 0, ~map_binding); - context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); - context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &dst_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &src_data, GL_PIXEL_UNPACK_BUFFER); } else { @@ -1660,7 +1660,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re width, height, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); data.buffer_object = 0; data.addr = dst_mem; @@ -2932,9 +2932,9 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &dst_data, GL_PIXEL_UNPACK_BUFFER); if (!same_sub_resource) - context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &src_data, GL_PIXEL_UNPACK_BUFFER); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) { SetRect(&dst_texture->swapchain->front_buffer_update, @@ -3054,7 +3054,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, memcpy(row, map.data, w * bpp); } - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2a8bff4..5e84a82 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -774,6 +774,7 @@ static void wined3d_texture_create_dc(void *object) static void wined3d_texture_destroy_dc(void *object) { const struct wined3d_texture_idx *idx = object; + struct wined3d_context_gl *context_gl = NULL; D3DKMT_DESTROYDCFROMMEMORY destroy_desc; struct wined3d_context *context = NULL; struct wined3d_texture *texture; @@ -804,10 +805,13 @@ static void wined3d_texture_destroy_dc(void *object) dc_info->bitmap = NULL; if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); @@ -2008,7 +2012,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s else format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; bo.addr = converted_mem; @@ -2715,6 +2719,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso { struct wined3d_texture_sub_resource *sub_resource; struct wined3d_device *device = resource->device; + struct wined3d_context_gl *context_gl = NULL; struct wined3d_context *context = NULL; struct wined3d_texture *texture; struct wined3d_bo_address data; @@ -2734,10 +2739,13 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso } if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f0b91a..04f160e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2112,6 +2112,8 @@ void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, G void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2269,8 +2271,6 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; /***************************************************************************** * Internal representation of a light

1 0