November 2021 - Wine-Commits

Huw Davies : winecoreaudio: Move is_format_supported to the unixlib.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 75b57ea13de48994d29401afebbbe534cd503b86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b57ea13de48994d29401af… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 23 07:54:58 2021 +0000 winecoreaudio: Move is_format_supported to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 65 ++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 255 +++---------------------------------- dlls/winecoreaudio.drv/unixlib.h | 11 ++ 3 files changed, 91 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75b57ea13de48994d294…

1 0

Alexandre Julliard : opencl: Don't call callback functions from the Unix side.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: f91c009786fa09723976dce0233592f69df5cead URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91c009786fa09723976dce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 15:10:53 2021 +0100 opencl: Don't call callback functions from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/unix_wrappers.c | 82 ++------------------------------------------- 1 file changed, 3 insertions(+), 79 deletions(-) diff --git a/dlls/opencl/unix_wrappers.c b/dlls/opencl/unix_wrappers.c index 9c83250b4e1..df8d7278ca2 100644 --- a/dlls/opencl/unix_wrappers.c +++ b/dlls/opencl/unix_wrappers.c @@ -26,80 +26,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); -struct program_callback -{ - void (WINAPI *pfn_notify)(cl_program program, void *user_data); - void *user_data; -}; - -static void CL_CALLBACK program_callback_wrapper(cl_program program, void *user_data) -{ - struct program_callback *callback = user_data; - TRACE("(%p, %p)\n", program, user_data); - callback->pfn_notify(program, callback->user_data); - free(callback); -} - cl_int WINAPI wrap_clBuildProgram( cl_program program, cl_uint num_devices, const cl_device_id *device_list, const char *options, void (WINAPI *pfn_notify)(cl_program program, void *user_data), void *user_data ) { - if (pfn_notify) - { - struct program_callback *callback; - cl_int ret; - - if (!(callback = malloc(sizeof(*callback)))) - return CL_OUT_OF_HOST_MEMORY; - callback->pfn_notify = pfn_notify; - callback->user_data = user_data; - if ((ret = clBuildProgram( program, num_devices, device_list, options, - program_callback_wrapper, callback )) != CL_SUCCESS) - free( callback ); - return ret; - } - + if (pfn_notify) FIXME( "notify callback not supported\n" ); return clBuildProgram( program, num_devices, device_list, options, NULL, NULL ); } -struct context_callback -{ - void (WINAPI *pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data); - void *user_data; -}; - -static void CL_CALLBACK context_callback_wrapper(const char *errinfo, - const void *private_info, size_t cb, void *user_data) -{ - struct context_callback *callback = user_data; - TRACE("(%s, %p, %zu, %p)\n", debugstr_a(errinfo), private_info, cb, user_data); - callback->pfn_notify(errinfo, private_info, cb, callback->user_data); -} - cl_context WINAPI wrap_clCreateContext( const cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (WINAPI *pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret ) { - if (pfn_notify) - { - struct context_callback *callback; - cl_context ret; - - /* FIXME: the callback structure is currently leaked */ - if (!(callback = malloc(sizeof(*callback)))) - { - *errcode_ret = CL_OUT_OF_HOST_MEMORY; - return NULL; - } - callback->pfn_notify = pfn_notify; - callback->user_data = user_data; - if (!(ret = clCreateContext( properties, num_devices, devices, context_callback_wrapper, callback, errcode_ret ))) - free( callback ); - return ret; - } - + if (pfn_notify) FIXME( "notify callback not supported\n" ); return clCreateContext( properties, num_devices, devices, NULL, NULL, errcode_ret ); } @@ -107,24 +48,7 @@ cl_context WINAPI wrap_clCreateContextFromType( const cl_context_properties *pro void (WINAPI *pfn_notify)(const char *errinfo, const void *private_info, size_t cb, void *user_data), void *user_data, cl_int *errcode_ret ) { - if (pfn_notify) - { - struct context_callback *callback; - cl_context ret; - - /* FIXME: the callback structure is currently leaked */ - if (!(callback = malloc(sizeof(*callback)))) - { - *errcode_ret = CL_OUT_OF_HOST_MEMORY; - return NULL; - } - callback->pfn_notify = pfn_notify; - callback->user_data = user_data; - if (!(ret = clCreateContextFromType( properties, device_type, context_callback_wrapper, callback, errcode_ret ))) - free( callback ); - return ret; - } - + if (pfn_notify) FIXME( "notify callback not supported\n" ); return clCreateContextFromType( properties, device_type, NULL, NULL, errcode_ret ); }

1 0

Hugh McMaster : conhost: Only use the maximum character width if a double-byte character set is in use.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 996126b2deccaad8c61f5d72d9c322fb7fb56a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=996126b2deccaad8c61f5d72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Nov 23 22:14:08 2021 +1100 conhost: Only use the maximum character width if a double-byte character set is in use. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 319463537d5..7ad0d48effd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -646,7 +646,7 @@ static HFONT select_font_config( struct console_config *config, unsigned int cp, lstrcpyW( config->face_name, lf->lfFaceName ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize == 2) config->cell_width = tm.tmMaxCharWidth; return font; @@ -713,7 +713,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) font_info->width = tm.tmMaxCharWidth; if (console->window->font) DeleteObject( console->window->font );

1 0

Alexandre Julliard : makedep: Unify the various code paths for module generation.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: f153ca0d14bbd611e5a2eaf78451735ab25768b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f153ca0d14bbd611e5a2eaf7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 15:05:48 2021 +0100 makedep: Unify the various code paths for module generation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a5ce73ae482..ac3e6d969e2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3125,8 +3125,9 @@ static void output_module( struct makefile *make ) struct strarray all_libs = empty_strarray; struct strarray dep_libs = empty_strarray; struct strarray imports = make->imports; - char *module_path = obj_dir_path( make, make->module ); - const char *debug_file = NULL; + char *module_name = strmake( "%s%s", make->module, make->is_cross ? "" : dll_ext ); + const char *debug_file; + const char *delay_load = delay_load_flag; char *spec_file = NULL; unsigned int i; @@ -3143,39 +3144,24 @@ static void output_module( struct makefile *make ) strarray_addall( &all_libs, libs ); } - if (make->is_cross) - { - if (delay_load_flag) - { - for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flag, make->delayimports.str[i], - strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); - } - strarray_add( &make->all_targets, strmake( "%s", make->module )); - add_install_rule( make, make->module, strmake( "%s", make->module ), - strmake( "c%s/%s", pe_dir, make->module )); - debug_file = get_debug_file( make, make->module ); - output( "%s:", module_path ); - } - else if (*dll_ext) + if (!make->is_cross && *dll_ext) delay_load = "-Wl,-delayload,"; + if (delay_load) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], + strarray_add( &all_libs, strmake( "%s%s%s", delay_load, make->delayimports.str[i], strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); - strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); - add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), - strmake( "p%s/%s%s", so_dir, make->module, dll_ext )); - output( "%s%s:", module_path, dll_ext ); } + strarray_add( &make->all_targets, module_name ); + + if (make->is_cross) + add_install_rule( make, make->module, module_name, strmake( "c%s/%s", pe_dir, module_name )); + else if (*dll_ext) + add_install_rule( make, make->module, module_name, strmake( "p%s/%s", so_dir, module_name )); else - { - strarray_add( &make->all_targets, make->module ); - add_install_rule( make, make->module, make->module, - strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); - debug_file = get_debug_file( make, make->module ); - output( "%s:", module_path ); - } + add_install_rule( make, make->module, module_name, + strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", module_name )); + output( "%s:", obj_dir_path( make, module_name )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); @@ -3193,6 +3179,7 @@ static void output_module( struct makefile *make ) output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); + debug_file = get_debug_file( make, make->module ); if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); output_filename( make->is_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" );

1 0

Henri Verbeet : wined3d: Respect the BO buffer offset in wined3d_unordered_access_view_gl_clear().
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 7816809395c1235a215d1faeb1d3a66a4f9504ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=7816809395c1235a215d1fae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 22 18:14:44 2021 -0600 wined3d: Respect the BO buffer offset in wined3d_unordered_access_view_gl_clear(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0ea14531766..5905a4bcfb5 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1598,7 +1598,7 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view get_buffer_view_range(buffer, &view_gl->v.desc, &format_gl->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, bo_gl->binding, bo_gl->id); GL_EXTCALL(glClearBufferSubData(bo_gl->binding, format_gl->internal, - offset, size, format_gl->format, format_gl->type, clear_value)); + bo_gl->b.buffer_offset + offset, size, format_gl->format, format_gl->type, clear_value)); wined3d_context_gl_reference_bo(context_gl, bo_gl); checkGLcall("clear unordered access view"); }

1 0

Nikolay Sivov : d3d10/effect: Fix freed register table pointer (Coverity).
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 2fd283e968bfd75424279387ae479a7bfaafcd5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd283e968bfd75424279387… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 21 19:45:16 2021 +0300 d3d10/effect: Fix freed register table pointer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 04250a1663e..b9992f84a8b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -305,7 +305,7 @@ static void d3d10_effect_preshader_clear(struct d3d10_effect_preshader *p) unsigned int i; for (i = 0; i < ARRAY_SIZE(p->reg_tables); ++i) - heap_free(&p->reg_tables[i].f); + heap_free(p->reg_tables[i].f); if (p->code) ID3D10Blob_Release(p->code); heap_free(p->vars);

1 0

Henri Verbeet : wined3d: Respect the BO buffer offset in create_buffer_texture().
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 0b9002de9672d8d05f078537b7daf55097e08c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9002de9672d8d05f078537… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 22 18:14:43 2021 -0600 wined3d: Respect the BO buffer offset in create_buffer_texture(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b981602f1a2..0ea14531766 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -257,6 +257,10 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c return; } + wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); + bo_gl = wined3d_bo_gl(buffer->buffer_object); + offset += bo_gl->b.buffer_offset; + if ((offset & (gl_info->limits.texture_buffer_offset_alignment - 1))) { FIXME("Buffer offset %u is not %u byte aligned.\n", @@ -264,9 +268,6 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c return; } - wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); - bo_gl = wined3d_bo_gl(buffer->buffer_object); - view->target = GL_TEXTURE_BUFFER; if (!view->name) gl_info->gl_ops.gl.p_glGenTextures(1, &view->name);

1 0

Alex Henrie : oleacc/tests: Fix failure messages in test_AccessibleObjectFromEvent.
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: d9984aa505a8968622e510f129299c6167c1bc2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9984aa505a8968622e510f1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 22 23:02:08 2021 -0700 oleacc/tests: Fix failure messages in test_AccessibleObjectFromEvent. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 62346ffed01..8c234aee8aa 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -720,7 +720,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 1, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == 1, "got %#x, expected 1\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent); SET_EXPECT(Accessible_get_accName); V_I4(&cid) = 0; @@ -736,7 +736,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 2, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == 2, "got %#x, expected 2\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent); SET_EXPECT(Accessible_get_accName); V_I4(&cid) = 0; @@ -752,7 +752,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible_child), "acc == &Accessible_child\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); SET_EXPECT(Accessible_child_get_accParent); SET_EXPECT(Accessible_child_get_accName); hr = IAccessible_get_accName(acc, cid, NULL); @@ -767,7 +767,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); ok(acc == &Accessible_child, "acc != &Accessible_child\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); SET_EXPECT(Accessible_child_get_accName); hr = IAccessible_get_accName(acc, cid, NULL); ok(hr == E_INVALIDARG, "get_accName returned %x\n", hr);

1 0

Zebediah Figura : wined3d: Respect the BO buffer offset in wined3d_buffer_gl_download_ranges().
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: d4c3bf9d795b4c92d4d69b035142863eda6856f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c3bf9d795b4c92d4d69b03… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 22 18:14:46 2021 -0600 wined3d: Respect the BO buffer offset in wined3d_buffer_gl_download_ranges(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cd277433c91..e5bc4c92e6b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1412,8 +1412,8 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glGetBufferSubData(bo_gl->binding, - range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + GL_EXTCALL(glGetBufferSubData(bo_gl->binding, bo_gl->b.buffer_offset + range->offset, + range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("buffer download"); }

1 0

Henri Verbeet : wined3d: Respect the BO buffer offset in wined3d_buffer_gl_upload_ranges().
by Alexandre Julliard Nov. 23, 2021

Nov. 23, 2021

Module: wine Branch: master Commit: 2961640bcb4161cff6731e22b95170e52ce5e670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2961640bcb4161cff6731e22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 22 18:14:45 2021 -0600 wined3d: Respect the BO buffer offset in wined3d_buffer_gl_upload_ranges(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d3aeb2e76f4..cd277433c91 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1387,8 +1387,8 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(bo_gl->binding, - range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + GL_EXTCALL(glBufferSubData(bo_gl->binding, bo_gl->b.buffer_offset + range->offset, + range->size, (BYTE *)data + range->offset - data_offset)); } wined3d_context_gl_reference_bo(context_gl, bo_gl); checkGLcall("buffer upload");

1 0