November 2021 - Wine-Commits

Henri Verbeet : wined3d: Allow OpenGL index buffer objects to be suballocated from a larger BO.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 6c6fcff96e5a1188816658871974f1aaaa575955 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6fcff96e5a118881665887… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:18 2021 -0600 wined3d: Allow OpenGL index buffer objects to be suballocated from a larger BO. 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/context_gl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 3868351a4b3..5767258973d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4909,10 +4909,12 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indexed) { struct wined3d_buffer *index_buffer = state->index_buffer; - if (!index_buffer->buffer_object || !stream_info->all_vbo) + struct wined3d_bo *bo = index_buffer->buffer_object; + + if (!bo || !stream_info->all_vbo) idx_data = index_buffer->resource.heap_memory; else - idx_data = NULL; + idx_data = (void *)wined3d_bo_gl(bo)->buffer_offset; idx_data = (const BYTE *)idx_data + state->index_offset; if (state->index_format == WINED3DFMT_R16_UINT)

1 0

Henri Verbeet : wined3d: Allow OpenGL uniform buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 8f0c9e490bc8266787cb1adf07f11791ca2d23ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f0c9e490bc8266787cb1adf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:20 2021 -0600 wined3d: Allow OpenGL uniform buffer objects to be suballocated from a larger buffer. 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/state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index adbaa50a349..e0dba8701bc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4577,6 +4577,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state enum wined3d_shader_type shader_type; struct wined3d_buffer *buffer; unsigned int i, base, count; + struct wined3d_bo_gl *bo_gl; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -4597,8 +4598,9 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state } buffer = buffer_state->buffer; + bo_gl = wined3d_bo_gl(buffer->buffer_object); GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i, - wined3d_bo_gl(buffer->buffer_object)->id, buffer_state->offset, buffer_state->size)); + bo_gl->id, bo_gl->buffer_offset + buffer_state->offset, buffer_state->size)); buffer->bo_user.valid = true; } checkGLcall("bind constant buffers");

1 0

Henri Verbeet : wined3d: Allow OpenGL atomic counter buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: ba5f90b29ac237e2aaf97b2cd132c913de47061f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5f90b29ac237e2aaf97b2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:21 2021 -0600 wined3d: Allow OpenGL atomic counter buffer objects to be suballocated from a larger buffer. 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/context_gl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5767258973d..2751a4a2182 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3788,7 +3788,8 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex format_gl->internal)); if (view_gl->counter_bo.id) - GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo.id)); + GL_EXTCALL(glBindBufferRange(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo.id, + view_gl->counter_bo.buffer_offset, view_gl->counter_bo.size)); } checkGLcall("Bind unordered access views"); }

1 0

Piotr Caban : ucrtbase: Fix fma test failures.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 1939528dab19ad769a4a5c6a4cbb02dfa479f6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1939528dab19ad769a4a5c6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:54:26 2021 +0100 ucrtbase: Fix fma test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51895 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 60f569c69ff..5f2a0992f2e 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -799,7 +799,7 @@ static void test_math_errors(void) errno = -1; exception.type = -1; p_func3d(tests3d[i].a, tests3d[i].b, tests3d[i].c); - ok(errno == tests3d[i].error, + ok(errno == tests3d[i].error || errno == -1, /* native is not setting errno if FMA3 is supported */ "%s(%f, %f, %f) got errno %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, errno); ok(exception.type == tests3d[i].exception, "%s(%f, %f, %f) got exception type %d\n", tests3d[i].func, tests3d[i].a, tests3d[i].b, tests3d[i].c, exception.type);

1 0

Andrey Gusev : wined3d: Add WINED3DFMT_R16_FLOAT vertex format.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 4f3d189f539ea0c9831ca3a19b49e21220830574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f3d189f539ea0c9831ca3a1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 19 14:37:21 2021 +0100 wined3d: Add WINED3DFMT_R16_FLOAT vertex format. Fixes rendering glitches in Batman: Arkham Knight. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/wined3d/utils.c | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 73151f2296c..a4729f9d2d3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12373,6 +12373,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R8_UINT, @@ -13648,6 +13649,7 @@ static void test_format_support(void) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT}, + {DXGI_FORMAT_R16_FLOAT}, }; if (!(device = create_device())) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 140e7cc195c..53087684acf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18552,6 +18552,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R8G8_UNORM, @@ -20622,6 +20623,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; device_desc.feature_level = &feature_level; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b0d7cc6eba..b7afa721587 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -727,6 +727,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, GL_SHORT}, {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT},

1 0

Dmitry Timoshkov : ntoskrnl: Add IoCreateDeviceSecure semi-stub.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 162991a03ceb4b45963b7129bffa89ee443c7e32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=162991a03ceb4b45963b7129… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 19 14:12:29 2021 +0300 ntoskrnl: Add IoCreateDeviceSecure semi-stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec297e7d64a..38a25bc5092 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1610,6 +1610,21 @@ static struct _OBJECT_TYPE device_type = POBJECT_TYPE IoDeviceObjectType = &device_type; +/*********************************************************************** + * IoCreateDeviceSecure (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateDeviceSecure( DRIVER_OBJECT *driver, ULONG ext_size, + UNICODE_STRING *name, DEVICE_TYPE type, + ULONG characteristics, BOOLEAN exclusive, + PCUNICODE_STRING sddl, LPCGUID guid, + DEVICE_OBJECT **ret_device ) +{ + FIXME( "(%p, %u, %s, %u, %x, %u, %s, %s, %p): semi-stub\n", + driver, ext_size, debugstr_us(name), type, characteristics, exclusive, + debugstr_us(sddl), wine_dbgstr_guid(guid), ret_device ); + + return IoCreateDevice( driver, ext_size, name, type, characteristics, exclusive, ret_device ); +} /*********************************************************************** * IoCreateDevice (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0208e2f633f..0cd50785ad6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -354,6 +354,7 @@ @ stub IoConnectInterrupt @ stub IoCreateController @ stdcall IoCreateDevice(ptr long ptr long long long ptr) +@ stdcall IoCreateDeviceSecure(ptr long ptr long long long ptr ptr ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) @ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 2c2bbf44632..b798d339561 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1701,6 +1701,7 @@ NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); BOOLEAN WINAPI IoCancelIrp(IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); +NTSTATUS WINAPI IoCreateDeviceSecure(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,PCUNICODE_STRING,LPCGUID,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*); PKEVENT WINAPI IoCreateSynchronizationEvent(UNICODE_STRING*,HANDLE*);

1 0

Connor McAdams : include: Add UI Automation Pattern ID definitions.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 824ea8cbc52aa298b6e6b3fd6649db4ba5efcd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824ea8cbc52aa298b6e6b3fd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 16 14:32:30 2021 -0500 include: Add UI Automation Pattern ID definitions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationclient.idl | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index a353a63816b..917d3456ebf 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -27,6 +27,49 @@ import "uiautomationcore.idl"; library UIAutomationClient { importlib ("stdole2.tlb"); + /* FIXME: Uncomment when properly supported in widl + [dllname("<no entry points>")] + module UIA_PatternIds + { + */ + const long UIA_InvokePatternId = 10000; + const long UIA_SelectionPatternId = 10001; + const long UIA_ValuePatternId = 10002; + const long UIA_RangeValuePatternId = 10003; + const long UIA_ScrollPatternId = 10004; + const long UIA_ExpandCollapsePatternId = 10005; + const long UIA_GridPatternId = 10006; + const long UIA_GridItemPatternId = 10007; + const long UIA_MultipleViewPatternId = 10008; + const long UIA_WindowPatternId = 10009; + const long UIA_SelectionItemPatternId = 10010; + const long UIA_DockPatternId = 10011; + const long UIA_TablePatternId = 10012; + const long UIA_TableItemPatternId = 10013; + const long UIA_TextPatternId = 10014; + const long UIA_TogglePatternId = 10015; + const long UIA_TransformPatternId = 10016; + const long UIA_ScrollItemPatternId = 10017; + const long UIA_LegacyIAccessiblePatternId = 10018; + const long UIA_ItemContainerPatternId = 10019; + const long UIA_VirtualizedItemPatternId = 10020; + const long UIA_SynchronizedInputPatternId = 10021; + const long UIA_ObjectModelPatternId = 10022; + const long UIA_AnnotationPatternId = 10023; + const long UIA_TextPattern2Id = 10024; + const long UIA_StylesPatternId = 10025; + const long UIA_SpreadsheetPatternId = 10026; + const long UIA_SpreadsheetItemPatternId = 10027; + const long UIA_TransformPattern2Id = 10028; + const long UIA_TextChildPatternId = 10029; + const long UIA_DragPatternId = 10030; + const long UIA_DropTargetPatternId = 10031; + const long UIA_TextEditPatternId = 10032; + const long UIA_CustomNavigationPatternId = 10033; + /* + } + */ + /* FIXME: Uncomment when properly supported in widl [dllname("<no entry points>")] module UIA_PropertyIds

1 0

Nikolay Sivov : d3d10/effect: Fix a trace message.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 44664237c91583bdba691992a3de94b67cbdc1a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44664237c91583bdba691992… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 15:58:01 2021 +0300 d3d10/effect: Fix a trace message. 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 3f35e9cc28a..04250a1663e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4115,7 +4115,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB if ((v = d3d10_effect_get_variable_by_index(effect, index))) { - TRACE("Returning %svariable %s.\n", is_var_shared(v) ? "shared " : NULL, debugstr_a(v->name)); + TRACE("Returning %svariable %s.\n", is_var_shared(v) ? "shared " : "", debugstr_a(v->name)); return &v->ID3D10EffectVariable_iface; }

1 0

Rémi Bernon : win32u: Guard font unused_entry against race condition.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 39fea6cd1eb175cddf3cbccc1fd09fec48da881e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39fea6cd1eb175cddf3cbccc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 19 12:23:38 2021 +0100 win32u: Guard font unused_entry against race condition. There is a race condition otherwise between release_gdi_font and find_cached_gdi_font, leading to invalid memory access: One thread calling release_gdi_font may decrement refcount to 0, then try to enter font_lock. At the same time, another thread may be calling find_cached_gdi_font through select_font, holding the font_lock. This second thread would find refcount set to 0, and then try to remove unused_entry from its list, although it hasn't been added yet to the unused list. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index d2f61526540..f9a0359e92c 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -2576,22 +2576,24 @@ static struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *m static void release_gdi_font( struct gdi_font *font ) { if (!font) return; - if (--font->refcount) return; TRACE( "font %p\n", font ); /* add it to the unused list */ pthread_mutex_lock( &font_lock ); - list_add_head( &unused_gdi_font_list, &font->unused_entry ); - if (unused_font_count > UNUSED_CACHE_SIZE) + if (!--font->refcount) { - font = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct gdi_font, unused_entry ); - TRACE( "freeing %p\n", font ); - list_remove( &font->entry ); - list_remove( &font->unused_entry ); - free_gdi_font( font ); + list_add_head( &unused_gdi_font_list, &font->unused_entry ); + if (unused_font_count > UNUSED_CACHE_SIZE) + { + font = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct gdi_font, unused_entry ); + TRACE( "freeing %p\n", font ); + list_remove( &font->entry ); + list_remove( &font->unused_entry ); + free_gdi_font( font ); + } + else unused_font_count++; } - else unused_font_count++; pthread_mutex_unlock( &font_lock ); }

1 0

Henri Verbeet : wined3d: Allow OpenGL vertex buffer objects to be suballocated from a larger BO.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: a9584bf5218d67e64f7c2bbf30d2e6b588a6246c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9584bf5218d67e64f7c2bbf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:17 2021 -0600 wined3d: Allow OpenGL vertex buffer objects to be suballocated from a larger BO. 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/context_gl.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index cec698d7a6b..3868351a4b3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2922,6 +2922,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; + bo->buffer_offset = 0; bo->b.map_ptr = NULL; return true; @@ -5070,7 +5071,11 @@ void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *conte static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_element *element, const struct wined3d_state *state) { - return element->data.addr + state->load_base_vertex_index * element->stride; + const uint8_t *offset = element->data.addr + state->load_base_vertex_index * element->stride; + + if (element->data.buffer_object) + offset += wined3d_bo_gl(element->data.buffer_object)->buffer_offset; + return offset; } void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90824d83290..79b02c2448d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1606,6 +1606,7 @@ struct wined3d_bo_gl struct wined3d_bo b; GLuint id; + GLsizeiptr buffer_offset; GLsizeiptr size; GLenum binding; GLenum usage;

1 0