August 2016 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Return data available in current chunk in chunked_get_avail_data.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: 16d300cacdeae49c73e334f5b519b112e019751f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d300cacdeae49c73e334f5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 15:33:40 2016 +0200 wininet: Return data available in current chunk in chunked_get_avail_data. Based on a patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 47700c9..ac79404 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2711,12 +2711,6 @@ static char next_chunked_data_char(chunked_stream_t *stream) return stream->buf[stream->buf_pos++]; } -static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) -{ - /* Allow reading only from read buffer */ - return 0; -} - static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; @@ -2858,6 +2852,26 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return ERROR_SUCCESS; } +static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) +{ + chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; + DWORD avail = 0; + + if(chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) { + DWORD res, read; + + /* try to process to the next chunk */ + res = chunked_read(stream, req, NULL, 0, &read, BLOCKING_DISALLOW); + if(res != ERROR_SUCCESS || chunked_stream->state != CHUNKED_STREAM_STATE_READING_CHUNK) + return 0; + } + + if(is_valid_netconn(req->netconn) && chunked_stream->buf_size < chunked_stream->chunk_size) + NETCON_query_data_available(req->netconn, &avail); + + return min(avail + chunked_stream->buf_size, chunked_stream->chunk_size); +} + static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_device_update_sub_resource().
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: 887bf4354345d54be5f291e6d361446bda87316e URL: http://source.winehq.org/git/wine.git/?a=commit;h=887bf4354345d54be5f291e6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:31 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_device_update_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ce06474..34ce224 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4151,7 +4151,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (!dst_point.x && !dst_point.y && src_rect.right == width && src_rect.bottom == height) wined3d_texture_prepare_texture(texture, context, FALSE); else - surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); wined3d_surface_upload_data(surface, gl_info, resource->format,

1 0

Nikolay Sivov : ddraw: Fix its vs it's typos.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: a4fabd283dd4d640ff6afc90905048b65df53ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fabd283dd4d640ff6afc909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 01:10:08 2016 +0300 ddraw: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/main.c | 2 +- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b3b171a..667dcd0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -180,7 +180,7 @@ struct ddraw_surface */ #define MAX_COMPLEX_ATTACHED 6 struct ddraw_surface *complex_array[MAX_COMPLEX_ATTACHED]; - /* You can't traverse the tree upwards. Only a flag for Surface::Release because its needed there, + /* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there, * but no pointer to prevent temptations to traverse it in the wrong direction. */ BOOL is_complex_root; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0f7398b..bb9e37f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -772,7 +772,7 @@ HRESULT WINAPI DllUnregisterServer(void) * * Params: * surf: The enumerated surface - * desc: it's description + * desc: its description * context: Pointer to the ddraw impl * * Returns: diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d877020..8c82e4c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -415,7 +415,7 @@ static void StateTest( void ) { HRESULT rc; - /* The msdn says its undocumented, does it return an error too? */ + /* The msdn says it's undocumented, does it return an error too? */ rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_ZVISIBLE, TRUE); ok(rc == D3D_OK, "IDirect3DDevice7_SetRenderState(D3DRENDERSTATE_ZVISIBLE, TRUE) returned %08x\n", rc); rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_ZVISIBLE, FALSE); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 154f9aa..000158d 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -480,7 +480,7 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, } /* According to the d3d test, the offscreen flag is set only - * if exactly one vertex is transformed. Its not documented, + * if exactly one vertex is transformed. It's not documented, * but the test shows that the lpOffscreen flag is set to the * flag combination of clipping planes that clips the vertex. * @@ -580,7 +580,7 @@ static HRESULT WINAPI d3d_viewport_GetBackground(IDirect3DViewport3 *iface, /***************************************************************************** * IDirect3DViewport3::SetBackgroundDepth * - * Sets a surface that represents the background depth. It's contents are + * Sets a surface that represents the background depth. Its contents are * used to set the depth buffer in IDirect3DViewport3::Clear * * Params:

1 0

Andrey Gusev : d3dx10: Add D3DX10CreateTextureFromMemory stub.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 7aadb08212a5269ebefcb100cf567f7cf7aa0a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aadb08212a5269ebefcb100c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 29 21:21:25 2016 +0300 d3dx10: Add D3DX10CreateTextureFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index f410be8..8c71cce 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -44,7 +44,7 @@ @ stub D3DX10CreateSprite(ptr long ptr) @ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) -@ stub D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stdcall D3DX10FilterTexture(ptr long long) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 7308373..3f81088 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -187,6 +187,17 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, + SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, + ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, src_data %p, src_data_size %lu, loadinfo %p, pump %p, texture %p, " + "hresult %p, stub!\n", + device, src_data, src_data_size, loadinfo, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter) { FIXME("texture %p, src_level %u, filter %#x stub!\n", texture, src_level, filter);

1 0

Nikolay Sivov : ucrtbase: Forward set_terminate().
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 4fe8b0cc1c6ec9e6e6e9ad088b0bb29f605e6086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe8b0cc1c6ec9e6e6e9ad088… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 1 14:01:17 2016 +0300 ucrtbase: Forward set_terminate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index cbda9ce..3ba1016 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -99,7 +99,7 @@ @ cdecl perror(str) ucrtbase.perror @ stub quick_exit @ cdecl raise(long) ucrtbase.raise -@ stub set_terminate +@ cdecl set_terminate(ptr) ucrtbase.set_terminate @ cdecl signal(long long) ucrtbase.signal @ cdecl strerror(long) ucrtbase.strerror @ cdecl strerror_s(ptr long long) ucrtbase.strerror_s diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 24a7f1f..6d7e631 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2480,7 +2480,7 @@ @ cdecl scalbn(double long) MSVCRT__scalb @ cdecl scalbnf(float long) MSVCRT__scalbf @ cdecl scalbnl(double long) MSVCR120_scalbnl -@ stub set_terminate +@ cdecl set_terminate(ptr) MSVCRT_set_terminate @ cdecl set_unexpected(ptr) MSVCRT_set_unexpected @ cdecl setbuf(ptr ptr) MSVCRT_setbuf @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp

1 0

Jacek Caban : wininet: Added chunked stream blocking tests.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: e7d6bba22e469e5508cbd248a4dd4fee4445da15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d6bba22e469e5508cbd248a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 16:17:12 2016 +0200 wininet: Added chunked stream blocking tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e84ffa3..bf3f690 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4718,6 +4718,47 @@ static void test_http_read(int port) close_async_handle(req.session, hCompleteEvent, 2); + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "\r\n" + "9\r\n123456789"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123456789"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("\r\n1\r\na\r\n1\r\nb\r", FALSE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "ab"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("\n3\r\nab", FALSE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "ab"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("c", FALSE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "c"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("\r\n1\r\nx\r\n0\r\n\r\n", TRUE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "x"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), ""); + + close_async_handle(req.session, hCompleteEvent, 2); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "\r\n" + "3\r\n123\r\n"); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_and_wait("0\r\n\r\n", TRUE, &ib); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), ""); + + close_async_handle(req.session, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); CloseHandle(conn_wait_event); CloseHandle(server_req_rec_event);

1 0

Jacek Caban : wininet: Rewrite chunked stream to store full stream state and allow non-blocking reads crossing chunk boundries.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 6e0c842dfa947263eb24cd88371e29e7e00bfd2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0c842dfa947263eb24cd883… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 16:17:00 2016 +0200 wininet: Rewrite chunked stream to store full stream state and allow non-blocking reads crossing chunk boundries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 278 ++++++++++++++++++++++++---------------------------- 1 file changed, 130 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e0c842dfa947263eb24c…

1 0

Michael Stefaniuc : ddraw: Use SetRectEmpty() instead of memset().
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 3e8a683658af896cfef5c160a59982c326f3e1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8a683658af896cfef5c160a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 30 22:07:45 2016 +0200 ddraw: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 398a3ec..db03303 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1012,7 +1012,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { if (flags & DDLOCK_READONLY) - memset(&surface->ddraw->primary_lock, 0, sizeof(surface->ddraw->primary_lock)); + SetRectEmpty(&surface->ddraw->primary_lock); else if (rect) surface->ddraw->primary_lock = *rect; else

1 0

Michael Stefaniuc : wined3d: Use SetRect() instead of open coding it.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 0d001e3e1cc631d0872e68a0d2ee1087e464aa75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d001e3e1cc631d0872e68a0d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 30 22:00:33 2016 +0200 wined3d: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++-------- dlls/wined3d/surface.c | 6 ++---- dlls/wined3d/texture.c | 5 +---- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ada36e..bb3a23b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4271,10 +4271,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewport.max_z = 1.0f; wined3d_cs_emit_set_viewport(device->cs, &state->viewport); - state->scissor_rect.top = 0; - state->scissor_rect.left = 0; - state->scissor_rect.right = view->width; - state->scissor_rect.bottom = view->height; + SetRect(&state->scissor_rect, 0, 0, view->width, view->height); wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } @@ -4928,10 +4925,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->viewport.height = view->height; wined3d_cs_emit_set_viewport(device->cs, &state->viewport); - state->scissor_rect.top = 0; - state->scissor_rect.left = 0; - state->scissor_rect.right = view->width; - state->scissor_rect.bottom = view->height; + SetRect(&state->scissor_rect, 0, 0, view->width, view->height); wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 781006f..ab4ee17 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -216,10 +216,8 @@ static void surface_get_rect(const struct wined3d_surface *surface, const RECT * { const struct wined3d_texture *texture = surface->container; - rect_out->left = 0; - rect_out->top = 0; - rect_out->right = wined3d_texture_get_level_width(texture, surface->texture_level); - rect_out->bottom = wined3d_texture_get_level_height(texture, surface->texture_level); + SetRect(rect_out, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level)); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1f0a97a..865fb4d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2602,10 +2602,7 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu surface = sub_resource->u.surface; w = surface->overlay_destrect.right - surface->overlay_destrect.left; h = surface->overlay_destrect.bottom - surface->overlay_destrect.top; - surface->overlay_destrect.left = x; - surface->overlay_destrect.top = y; - surface->overlay_destrect.right = x + w; - surface->overlay_destrect.bottom = y + h; + SetRect(&surface->overlay_destrect, x, y, x + w, y + h); return WINED3D_OK; }

1 0

Matteo Bruni : wined3d: Also check BLENDWEIGHT for immediate mode fallback.
by Alexandre Julliard Aug. 1, 2016

Aug. 1, 2016

Module: wine Branch: master Commit: 75c8eba5250a96eb585a852c5381e5289a782290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c8eba5250a96eb585a852c5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 29 21:01:49 2016 +0200 wined3d: Also check BLENDWEIGHT for immediate mode fallback. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 085ed03..a85f3fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3215,7 +3215,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] - & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR)); + & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if ((stream_info->position_transformed && !d3d_info->xyzrhw) || (stream_info->use_map & slow_mask))

1 0