wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Józef Kucia : wined3d: Implement SM5 ubfe instruction.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 5f57848911e5eecdfe8f9f53fd478aa42c8f9b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f57848911e5eecdfe8f9f53f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:08 2017 +0100 wined3d: Implement SM5 ubfe instruction. 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> --- dlls/wined3d/glsl_shader.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e550318..785cd76 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3793,11 +3793,22 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) { + struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct wined3d_shader_dst_param dst; struct glsl_src_param src[4]; + const char *instruction; unsigned int i, j; DWORD write_mask; + switch (ins->handler_idx) + { + case WINED3DSIH_BFI: instruction = "bitfieldInsert"; break; + case WINED3DSIH_UBFE: instruction = "bitfieldExtract"; break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } + dst = ins->dst[0]; for (i = 0; i < 4; ++i) { @@ -3808,10 +3819,12 @@ static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) &dst, dst.reg.data_type))) continue; - for (j = 0; j < ARRAY_SIZE(src); ++j) + for (j = 0; j < ins->src_count; ++j) shader_glsl_add_src_param(ins, &ins->src[j], write_mask, &src[j]); - shader_addline(ins->ctx->buffer, "bitfieldInsert(%s, %s, %s & 0x1f, %s & 0x1f));\n", - src[3].param_str, src[2].param_str, src[1].param_str, src[0].param_str); + shader_addline(buffer, "%s(", instruction); + for (j = 0; j < ins->src_count - 2; ++j) + shader_addline(buffer, "%s, ", src[ins->src_count - j - 1].param_str); + shader_addline(buffer, "%s & 0x1f, %s & 0x1f));\n", src[1].param_str, src[0].param_str); } } @@ -9066,7 +9079,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, - /* WINED3DSIH_UBFE */ NULL, + /* WINED3DSIH_UBFE */ shader_glsl_bitwise_op, /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_ULT */ shader_glsl_relop,

1 0

Józef Kucia : wined3d: Implement SM5 bfi instruction.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: f7b619d7ce09ed5130e30cf34e55db1848568e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b619d7ce09ed5130e30cf34… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:07 2017 +0100 wined3d: Implement SM5 bfi instruction. 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> --- dlls/d3d11/tests/d3d11.c | 40 +++++++++++++++++++--------------------- dlls/wined3d/glsl_shader.c | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ccecaf3..32355d9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10731,29 +10731,28 @@ static void test_uint_shader_instructions(void) const struct shader *ps; unsigned int bits[4]; struct uvec4 expected_result; - BOOL todo; } tests[] = { - {&ps_bfi, { 0, 0, 0, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, { 0, 0, 0, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, { ~0u, 0, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}, TRUE}, - {&ps_bfi, { ~0u, ~0u, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}, TRUE}, - {&ps_bfi, { ~0u, 0x1fu, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}, TRUE}, - {&ps_bfi, { ~0u, ~0x1fu, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}, TRUE}, - {&ps_bfi, { 0, 0, 0xff, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, { 0, 0, 0xff, 2}, { 2, 2, 2, 2}, TRUE}, - {&ps_bfi, { 16, 16, 0xff, 0xff}, {0x00ff00ff, 0x00ff00ff, 0x00ff00ff, 0x00ff00ff}, TRUE}, - {&ps_bfi, { 0, 0, ~0u, ~0u}, { ~0u, ~0u, ~0u, ~0u}, TRUE}, - {&ps_bfi, {~0x1fu, 0, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, {~0x1fu, 0, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, {~0x1fu, 0, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, - {&ps_bfi, { 0, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, { 0, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, { 0, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, - {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, - {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, - {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, + {&ps_bfi, { 0, 0, 0, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, { 0, 0, 0, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, { ~0u, 0, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}}, + {&ps_bfi, { ~0u, ~0u, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}}, + {&ps_bfi, { ~0u, 0x1fu, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}}, + {&ps_bfi, { ~0u, ~0x1fu, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}}, + {&ps_bfi, { 0, 0, 0xff, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, { 0, 0, 0xff, 2}, { 2, 2, 2, 2}}, + {&ps_bfi, { 16, 16, 0xff, 0xff}, {0x00ff00ff, 0x00ff00ff, 0x00ff00ff, 0x00ff00ff}}, + {&ps_bfi, { 0, 0, ~0u, ~0u}, { ~0u, ~0u, ~0u, ~0u}}, + {&ps_bfi, {~0x1fu, 0, ~0u, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, {~0x1fu, 0, ~0u, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, {~0x1fu, 0, ~0u, 2}, { 2, 2, 2, 2}}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}}, {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}}, {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}}, @@ -10809,7 +10808,6 @@ static void test_uint_shader_instructions(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, tests[i].bits, 0, 0); draw_quad(&test_context); - todo_wine_if(tests[i].todo) check_texture_uvec4(texture, &tests[i].expected_result); ID3D11PixelShader_Release(ps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f83563..e550318 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3791,6 +3791,30 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_dst_param dst; + struct glsl_src_param src[4]; + unsigned int i, j; + DWORD write_mask; + + dst = ins->dst[0]; + for (i = 0; i < 4; ++i) + { + write_mask = WINED3DSP_WRITEMASK_0 << i; + dst.write_mask = ins->dst[0].write_mask & write_mask; + + if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, + &dst, dst.reg.data_type))) + continue; + + for (j = 0; j < ARRAY_SIZE(src); ++j) + shader_glsl_add_src_param(ins, &ins->src[j], write_mask, &src[j]); + shader_addline(ins->ctx->buffer, "bitfieldInsert(%s, %s, %s & 0x1f, %s & 0x1f));\n", + src[3].param_str, src[2].param_str, src[1].param_str, src[0].param_str); + } +} + static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) @@ -8844,7 +8868,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_UMIN */ NULL, /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, - /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFI */ shader_glsl_bitwise_op, /* WINED3DSIH_BFREV */ shader_glsl_map2gl, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc,

1 0

Bruno Jesus : mciqtz32: Implement MCI_DGV_PLAY_REPEAT.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 71fbaba42690efd8363e0c9f5fac2158b07a977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fbaba42690efd8363e0c9f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 23:01:25 2017 -0200 mciqtz32: Implement MCI_DGV_PLAY_REPEAT. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 41 +++++++++++++++++++++++++++++------------ dlls/mciqtz32/mciqtz_private.h | 3 +++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 54f3b78..1aec326 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -359,6 +359,18 @@ static DWORD CALLBACK MCIQTZ_notifyThread(LPVOID parm) } } while (hr == S_OK && event_code != EC_COMPLETE); if (hr == S_OK && event_code == EC_COMPLETE) { + /* Repeat the music by seeking and running again */ + if (wma->mci_flags & MCI_DGV_PLAY_REPEAT) { + TRACE("repeat media as requested\n"); + IMediaControl_Stop(wma->pmctrl); + IMediaSeeking_SetPositions(wma->seek, + &wma->seek_start, + AM_SEEKING_AbsolutePositioning, + &wma->seek_stop, + AM_SEEKING_AbsolutePositioning); + IMediaControl_Run(wma->pmctrl); + continue; + } old = InterlockedExchangePointer(&wma->callback, NULL); if (old) mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_SUCCESSFUL); @@ -387,9 +399,8 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms { WINE_MCIQTZ* wma; HRESULT hr; - REFERENCE_TIME time1 = 0, time2 = 0; GUID format; - DWORD pos1; + DWORD start_flags; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -408,23 +419,29 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_ABORTED); } + wma->mci_flags = dwFlags; IMediaSeeking_GetTimeFormat(wma->seek, &format); if (dwFlags & MCI_FROM) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time1 = lpParms->dwFrom * 10000; + wma->seek_start = lpParms->dwFrom * 10000; else - time1 = lpParms->dwFrom; - pos1 = AM_SEEKING_AbsolutePositioning; - } else - pos1 = AM_SEEKING_NoPositioning; + wma->seek_start = lpParms->dwFrom; + start_flags = AM_SEEKING_AbsolutePositioning; + } else { + wma->seek_start = 0; + start_flags = AM_SEEKING_NoPositioning; + } if (dwFlags & MCI_TO) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time2 = lpParms->dwTo * 10000; + wma->seek_stop = lpParms->dwTo * 10000; else - time2 = lpParms->dwTo; - } else - IMediaSeeking_GetDuration(wma->seek, &time2); - IMediaSeeking_SetPositions(wma->seek, &time1, pos1, &time2, AM_SEEKING_AbsolutePositioning); + wma->seek_stop = lpParms->dwTo; + } else { + wma->seek_stop = 0; + IMediaSeeking_GetDuration(wma->seek, &wma->seek_stop); + } + IMediaSeeking_SetPositions(wma->seek, &wma->seek_start, start_flags, + &wma->seek_stop, AM_SEEKING_AbsolutePositioning); hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 27939aa..aa6fad9 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -37,6 +37,9 @@ typedef struct { IBasicVideo* vidbasic; IBasicAudio* audio; DWORD time_format; + DWORD mci_flags; + REFERENCE_TIME seek_start; + REFERENCE_TIME seek_stop; UINT command_table; HWND parent; MCIDEVICEID notify_devid;

1 0

Nikolay Sivov : include: Added GetThreadUILanguage() prototype.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 532926b5f70e1b772816e65994d0dd4d38b87748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532926b5f70e1b772816e6599… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 16:53:18 2017 +0300 include: Added GetThreadUILanguage() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 96f60de..d6fcf6e 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -921,6 +921,7 @@ WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI LCID WINAPI GetThreadLocale(void); WINBASEAPI BOOL WINAPI GetThreadPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); +WINBASEAPI LANGID WINAPI GetThreadUILanguage(void); WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);

1 0

Henri Verbeet : wined3d: Do not preload the buffer in wined3d_buffer_unmap ().
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 6fd212818d6ade9d571aba1566b5e56ce594b01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd212818d6ade9d571aba156… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:14 2017 +0100 wined3d: Do not preload the buffer in wined3d_buffer_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 6 +----- dlls/wined3d/context.c | 6 +++++- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1fdf0a3..de5ab17 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -879,7 +879,7 @@ drop_query: This->flags &= ~WINED3D_BUFFER_APPLESYNC; } -void buffer_mark_used(struct wined3d_buffer *buffer) +static void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_DISCARD; } @@ -1188,10 +1188,6 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) buffer_clear_dirty_areas(buffer); buffer->map_ptr = NULL; } - else if (buffer->flags & WINED3D_BUFFER_HASDESC) - { - wined3d_resource_preload(&buffer->resource); - } } HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cd0057e..fdf684e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3505,8 +3505,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) { if (map & 1) - buffer_mark_used(state->streams[context->stream_info.elements[i].stream_idx].buffer); + wined3d_buffer_load(state->streams[context->stream_info.elements[i].stream_idx].buffer, + context, state); } + /* Loading the buffers above may have invalidated the stream info. */ + if (isStateDirty(context, STATE_STREAMSRC)) + context_update_stream_info(context, state); } if (state->index_buffer) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1cae2fe..9c32f2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3239,7 +3239,6 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Load WINED3D_LOCATION_BUFFER if needed in wined3d_buffer_map().
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 413ccc82db6cbfa93ef89295de0f70fb567ff9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=413ccc82db6cbfa93ef89295d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:13 2017 +0100 wined3d: Load WINED3D_LOCATION_BUFFER if needed in wined3d_buffer_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4da1a3b..1fdf0a3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1034,6 +1034,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } if (!(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_READONLY)) + || ((flags & WINED3D_MAP_READONLY) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) @@ -1048,6 +1049,14 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } else { + const struct wined3d_gl_info *gl_info; + + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + if (!(flags & WINED3D_MAP_DISCARD)) + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (!(flags & WINED3D_MAP_READONLY)) buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); @@ -1056,11 +1065,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (count == 1) { - const struct wined3d_gl_info *gl_info; - - context = context_acquire(device, NULL); - gl_info = context->gl_info; - buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) @@ -1105,8 +1109,9 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL; } - context_release(context); } + + context_release(context); } if (flags & WINED3D_MAP_DISCARD)

1 0

Henri Verbeet : wined3d: Implement wined3d_buffer_upload_data() on top of wined3d_buffer_upload_ranges().
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: e2dbbec1af8ae2ea8813148d56e14c8c211ee334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2dbbec1af8ae2ea8813148d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:12 2017 +0100 wined3d: Implement wined3d_buffer_upload_data() on top of wined3d_buffer_upload_ranges(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 30 +++++++++++------------------- dlls/wined3d/device.c | 13 ++++++++++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index add6052..4da1a3b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -532,7 +532,7 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) /* Context activation is done by the caller. */ static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int range_count, const struct wined3d_map_range *ranges) + const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; @@ -543,7 +543,7 @@ static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct w { range = &ranges[range_count]; GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, - range->offset, range->size, (BYTE *)data + range->offset)); + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("glBufferSubData"); } @@ -599,7 +599,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - wined3d_buffer_upload_ranges(buffer, context, data, buffer->modified_areas, buffer->maps); + wined3d_buffer_upload_ranges(buffer, context, data, 0, buffer->modified_areas, buffer->maps); HeapFree(GetProcessHeap(), 0, data); } @@ -683,7 +683,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, case WINED3D_LOCATION_BUFFER: if (!buffer->conversion_map) wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, - buffer->modified_areas, buffer->maps); + 0, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); break; @@ -1266,31 +1266,23 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ return WINED3D_OK; } -HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, +void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) { - UINT offset, size; - HRESULT hr; - BYTE *ptr; + struct wined3d_map_range range; if (box) { - offset = box->left; - size = box->right - box->left; + range.offset = box->left; + range.size = box->right - box->left; } else { - offset = 0; - size = buffer->resource.size; + range.offset = 0; + range.size = buffer->resource.size; } - if (FAILED(hr = wined3d_buffer_map(buffer, offset, size, &ptr, 0))) - return hr; - - memcpy(ptr, data, size); - - wined3d_buffer_unmap(buffer); - return WINED3D_OK; + wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } static ULONG buffer_resource_incref(struct wined3d_resource *resource) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7898527..73b7e69 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4061,7 +4061,6 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - HRESULT hr; if (sub_resource_idx > 0) { @@ -4069,8 +4068,16 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str return; } - if (FAILED(hr = wined3d_buffer_upload_data(buffer, box, data))) - WARN("Failed to update buffer data, hr %#x.\n", hr); + context = context_acquire(resource->device, NULL); + if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) + { + ERR("Failed to load buffer location.\n"); + return; + } + + wined3d_buffer_upload_data(buffer, context, box, data); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); + context_release(context); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e1282a..1cae2fe 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3250,7 +3250,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; -HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, +void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view

1 0

Henri Verbeet : wined3d: Support WINED3D_LOCATION_BUFFER in wined3d_buffer_load_location().
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 160ad4570e6b3fa22baff2f5f98e0f16c194e00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=160ad4570e6b3fa22baff2f5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:11 2017 +0100 wined3d: Support WINED3D_LOCATION_BUFFER in wined3d_buffer_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 178 ++++++++++++++++++++++++-------------------------- 1 file changed, 86 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2f82469..add6052 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -530,6 +530,80 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) return refcount; } +/* Context activation is done by the caller. */ +static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + const void *data, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_map_range *range; + + buffer_bind(buffer, context); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset)); + } + checkGLcall("glBufferSubData"); +} + +static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + unsigned int i, j, range_idx, start, end, vertex_count; + BYTE *data; + + if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + { + ERR("Failed to load system memory.\n"); + return; + } + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + + /* Now for each vertex in the buffer that needs conversion. */ + vertex_count = buffer->resource.size / buffer->stride; + + if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + { + ERR("Out of memory.\n"); + return; + } + + for (range_idx = 0; range_idx < buffer->modified_areas; ++range_idx) + { + start = buffer->maps[range_idx].offset; + end = start + buffer->maps[range_idx].size; + + memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); + for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) + { + for (j = 0; j < buffer->stride;) + { + switch (buffer->conversion_map[j]) + { + case CONV_NONE: + /* Done already */ + j += sizeof(DWORD); + break; + case CONV_D3DCOLOR: + j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); + break; + case CONV_POSITIONT: + j += fixup_transformed_pos((struct wined3d_vec4 *) (data + i * buffer->stride + j)); + break; + default: + FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); + ++j; + } + } + } + } + + wined3d_buffer_upload_ranges(buffer, context, data, buffer->modified_areas, buffer->maps); + + HeapFree(GetProcessHeap(), 0, data); +} + static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { @@ -607,8 +681,12 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, break; case WINED3D_LOCATION_BUFFER: - FIXME("Not implemented yet.\n"); - return FALSE; + if (!buffer->conversion_map) + wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, + buffer->modified_areas, buffer->maps); + else + buffer_conversion_upload(buffer, context); + break; default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); @@ -616,6 +694,10 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, } wined3d_buffer_validate_location(buffer, location); + if (buffer->resource.heap_memory && location == WINED3D_LOCATION_BUFFER + && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) + wined3d_buffer_evict_sysmem(buffer); + return TRUE; } @@ -797,80 +879,6 @@ drop_query: This->flags &= ~WINED3D_BUFFER_APPLESYNC; } -/* Context activation is done by the caller. */ -static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int range_count, const struct wined3d_map_range *ranges) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_map_range *range; - - buffer_bind(buffer, context); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, - range->offset, range->size, (BYTE *)data + range->offset)); - } - checkGLcall("glBufferSubData"); -} - -static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) -{ - unsigned int i, j, range_idx, start, end, vertex_count; - BYTE *data; - - if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) - { - ERR("Failed to load system memory.\n"); - return; - } - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; - - /* Now for each vertex in the buffer that needs conversion. */ - vertex_count = buffer->resource.size / buffer->stride; - - if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) - { - ERR("Out of memory.\n"); - return; - } - - for (range_idx = 0; range_idx < buffer->modified_areas; ++range_idx) - { - start = buffer->maps[range_idx].offset; - end = start + buffer->maps[range_idx].size; - - memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); - for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) - { - for (j = 0; j < buffer->stride;) - { - switch (buffer->conversion_map[j]) - { - case CONV_NONE: - /* Done already */ - j += sizeof(DWORD); - break; - case CONV_D3DCOLOR: - j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); - break; - case CONV_POSITIONT: - j += fixup_transformed_pos((struct wined3d_vec4 *) (data + i * buffer->stride + j)); - break; - default: - FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); - ++j; - } - } - } - } - - wined3d_buffer_upload_ranges(buffer, context, data, buffer->modified_areas, buffer->maps); - - HeapFree(GetProcessHeap(), 0, data); -} - void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_DISCARD; @@ -981,22 +989,8 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * } } - if (!buffer->conversion_map) - { - TRACE("No conversion needed.\n"); - - wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, - buffer->modified_areas, buffer->maps); - } - else - { - buffer_conversion_upload(buffer, context); - } - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - - if (buffer->resource.heap_memory && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) - wined3d_buffer_evict_sysmem(buffer); - + if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) + ERR("Failed to load buffer location.\n"); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)

1 0

Henri Verbeet : wined3d: Do not pin system memory in wined3d_buffer_load_location().
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 15d53761a5fbfc12fc5f9974c029dace00eab33d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d53761a5fbfc12fc5f9974c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:10 2017 +0100 wined3d: Do not pin system memory in wined3d_buffer_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6b48d98..2f82469 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -604,7 +604,6 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; break; case WINED3D_LOCATION_BUFFER: @@ -623,7 +622,8 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, /* Context activation is done by the caller. */ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + if (wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; return buffer->resource.heap_memory; } @@ -655,7 +655,6 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - DWORD flags = buffer->flags; TRACE("buffer %p.\n", buffer); @@ -665,11 +664,7 @@ static void buffer_unload(struct wined3d_resource *resource) context = context_acquire(resource->device, NULL); - /* Download the buffer, but don't permanently enable double buffering. */ wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - if (!(flags & WINED3D_BUFFER_PIN_SYSMEM)) - buffer->flags &= ~WINED3D_BUFFER_PIN_SYSMEM; - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); buffer_destroy_buffer_object(buffer, context); buffer_clear_dirty_areas(buffer); @@ -825,7 +820,12 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined unsigned int i, j, range_idx, start, end, vertex_count; BYTE *data; - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + { + ERR("Failed to load system memory.\n"); + return; + } + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; /* Now for each vertex in the buffer that needs conversion. */ vertex_count = buffer->resource.size / buffer->stride; @@ -1106,6 +1106,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI { TRACE("Falling back to doublebuffered operation.\n"); wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL;

1 0

Jacek Caban : msctf: Use correct sink for ITfThreadFocusSink.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 7ebe59b922bf419296563b0ad24adc22a953fdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ebe59b922bf419296563b0ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 14:34:32 2017 +0100 msctf: Use correct sink for ITfThreadFocusSink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index ed42b54..d5e7fe0 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -30,6 +30,7 @@ #define COOKIE_MAGIC_EDITCOOKIE 0x0050 #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 #define COOKIE_MAGIC_DMSINK 0x0070 +#define COOKIE_MAGIC_THREADFOCUSSINK 0x0080 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 62ddfd2..2c4100b 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -618,7 +618,7 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, if (IsEqualIID(riid, &IID_ITfThreadFocusSink)) { WARN("semi-stub for ITfThreadFocusSink: sink won't be used.\n"); - return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017