July 2016 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Use a binary search for PtInRegion() and RectInRegion( ).
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: f59d3f60e1ada4fbd37a8c7a71f917b309cee837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59d3f60e1ada4fbd37a8c7a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 6 11:09:13 2016 +0100 gdi32: Use a binary search for PtInRegion() and RectInRegion(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 646512f..cea2dab 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1038,15 +1038,7 @@ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - int i; - - if (obj->numRects > 0 && is_in_rect(&obj->extents, x, y)) - for (i = 0; i < obj->numRects; i++) - if (is_in_rect(&obj->rects[i], x, y)) - { - ret = TRUE; - break; - } + region_find_pt( obj, x, y, &ret ); GDI_ReleaseObj( hrgn ); } return ret; @@ -1071,6 +1063,7 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) WINEREGION *obj; BOOL ret = FALSE; RECT rc; + int i; /* swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ @@ -1079,29 +1072,23 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - RECT *pCurRect, *pRectEnd; - - /* this is (just) a useful optimization */ if ((obj->numRects > 0) && overlapping(&obj->extents, &rc)) { - for (pCurRect = obj->rects, pRectEnd = pCurRect + - obj->numRects; pCurRect < pRectEnd; pCurRect++) + for (i = region_find_pt( obj, rc.left, rc.top, &ret ); !ret && i < obj->numRects; i++ ) { - if (pCurRect->bottom <= rc.top) + if (obj->rects[i].bottom <= rc.top) continue; /* not far enough down yet */ - if (pCurRect->top >= rc.bottom) + if (obj->rects[i].top >= rc.bottom) break; /* too far down */ - if (pCurRect->right <= rc.left) + if (obj->rects[i].right <= rc.left) continue; /* not far enough over yet */ - if (pCurRect->left >= rc.right) { + if (obj->rects[i].left >= rc.right) continue; - } ret = TRUE; - break; } } GDI_ReleaseObj(hrgn);

1 0

Huw Davies : gdi32: Precompute the destination colours for sources with a colour table.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: f7b6a7d77afef6a176233ae79a15819d692a29f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b6a7d77afef6a176233ae79… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 7 08:44:32 2016 +0100 gdi32: Precompute the destination colours for sources with a colour table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 269 ++++++++++++++++++++++++++++------------- 1 file changed, 187 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7b6a7d77afef6a176233…

1 0

Józef Kucia : d3d11: Implement d3d10_query_GetDataSize().
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: cc6be0c49e7507a4352a72d1dcdc65f5b32b4cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6be0c49e7507a4352a72d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:28 2016 +0200 d3d11: Implement d3d10_query_GetDataSize(). 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/async.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 38c8a28..323a348 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -283,9 +283,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + unsigned int data_size; + + TRACE("iface %p.\n", iface); - return 0; + wined3d_mutex_lock(); + data_size = wined3d_query_get_data_size(query->wined3d_query); + wined3d_mutex_unlock(); + + return data_size; } /* ID3D10Query methods */

1 0

Józef Kucia : d3d11: Implement d3d10_query_Begin().
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 718d3119e56a6e56dd929015b59d8fba4596412e URL: http://source.winehq.org/git/wine.git/?a=commit;h=718d3119e56a6e56dd929015b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:29 2016 +0200 d3d11: Implement d3d10_query_Begin(). 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/async.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 323a348..494a23b 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -266,7 +266,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + HRESULT hr; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface)

1 0

Józef Kucia : d3d11: Implement d3d10_query_End().
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 2cadc6793bcc4bc831865eddb3e0c518714fd032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cadc6793bcc4bc831865eddb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:30 2016 +0200 d3d11: Implement d3d10_query_End(). 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/async.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 494a23b..2e57ed6 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -279,7 +279,15 @@ static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + HRESULT hr; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags)

1 0

Józef Kucia : d3d11: Implement d3d10_query_GetData().
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: a9f09cf06037e43b5a987e8e7d1bd5177c53c754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f09cf06037e43b5a987e8e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:31 2016 +0200 d3d11: Implement d3d10_query_GetData(). 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/async.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 2e57ed6..fa38484 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -292,9 +292,27 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) { - FIXME("iface %p, data %p, data_size %u, flags %#x stub!\n", iface, data, data_size, flags); + struct d3d_query *query = impl_from_ID3D10Query(iface); + unsigned int wined3d_flags; + HRESULT hr; + + TRACE("iface %p, data %p, data_size %u, flags %#x.\n", iface, data, data_size, flags); + + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags); + + wined3d_mutex_lock(); + if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) + { + hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + } + else + { + WARN("Invalid data size %u.\n", data_size); + hr = E_INVALIDARG; + } + wined3d_mutex_unlock(); - return E_NOTIMPL; + return hr; } static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface)

1 0

Józef Kucia : d3d10core/tests: Port test_timestamp_query() from d3d9.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 93f589df0d8601ca011d25b1ba83943675bc02a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f589df0d8601ca011d25b1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:32 2016 +0200 d3d10core/tests: Port test_timestamp_query() from d3d9. 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/d3d10core/tests/device.c | 155 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7067ee6..4ef1b49 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3443,6 +3443,160 @@ static void test_create_query(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_timestamp_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + + D3D10_QUERY_DATA_TIMESTAMP_DISJOINT disjoint, prev_disjoint; + ID3D10Query *timestamp_query, *timestamp_disjoint_query; + struct d3d10core_test_context test_context; + D3D10_QUERY_DESC query_desc; + unsigned int data_size, i; + ID3D10Device *device; + UINT64 timestamp; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + query_desc.Query = D3D10_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Query_GetDataSize(timestamp_query); + ok(data_size == sizeof(UINT64), "Got unexpected data size %u.\n", data_size); + + query_desc.Query = D3D10_QUERY_TIMESTAMP_DISJOINT; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_disjoint_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D10Query_GetDataSize(timestamp_disjoint_query); + ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); + + /* Test a TIMESTAMP_DISJOINT query. */ + ID3D10Query_Begin(timestamp_disjoint_query); + ID3D10Query_End(timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + prev_disjoint = disjoint; + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + ok(disjoint.Disjoint == 0xff, "Disjoint data was modified.\n"); + + hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), D3D10_ASYNC_GETDATA_DONOTFLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); + + hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ + ID3D10Query_Begin(timestamp_disjoint_query); + + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D10Query_End(timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + timestamp = 0xdeadbeef; + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(timestamp != 0xdeadbeef, "Timestamp was not modified.\n"); + + timestamp = 0xdeadbeef; + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) - 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) + 1, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) / 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp) * 2, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(timestamp == 0xdeadbeef, "Timestamp was modified.\n"); + + ID3D10Query_End(timestamp_disjoint_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + disjoint.Frequency = 0xdeadbeef; + disjoint.Disjoint = 0xff; + hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency != 0xdeadbeef, "Frequency data was not modified.\n"); + ok(disjoint.Disjoint == TRUE || disjoint.Disjoint == FALSE, "Got unexpected disjoint %#x.\n", disjoint.Disjoint); + + /* It's not strictly necessary for the TIMESTAMP query to be inside a TIMESTAMP_DISJOINT query. */ + ID3D10Query_Release(timestamp_query); + query_desc.Query = D3D10_QUERY_TIMESTAMP; + query_desc.MiscFlags = 0; + hr = ID3D10Device_CreateQuery(device, &query_desc, &timestamp_query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + draw_color_quad(&test_context, &red); + + ID3D10Query_End(timestamp_query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10Query_Release(timestamp_query); + ID3D10Query_Release(timestamp_disjoint_query); + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D10Device *device; @@ -8257,6 +8411,7 @@ START_TEST(device) test_create_depthstencil_state(); test_create_rasterizer_state(); test_create_query(); + test_timestamp_query(); test_device_removed_reason(); test_scissor(); test_clear_state();

1 0

Józef Kucia : wined3d: Recognize SM5 bfrev opcode.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 0dc4c3afb2dc5ff8c917f006a1ab7d631f5ea22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc4c3afb2dc5ff8c917f006a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:33 2016 +0200 wined3d: Recognize SM5 bfrev opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index deae1cc..24c1194 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5215,6 +5215,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFREV */ NULL, /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8b5af9e..c9c0773 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8581,6 +8581,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, + /* WINED3DSIH_BFREV */ NULL, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9bf7164..6a9f7fc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -45,6 +45,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_AND */ "and", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", + /* WINED3DSIH_BFREV */ "bfrev", /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", /* WINED3DSIH_BREAKP */ "breakp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index abfcf4f..72cd5fc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -216,6 +216,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_BFI = 0x8c, + WINED3D_SM5_OP_BFREV = 0x8d, WINED3D_SM5_OP_SWAPC = 0x8e, WINED3D_SM5_OP_DCL_STREAM = 0x8f, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, @@ -811,6 +812,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, + {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec52b15..8d97d2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,6 +560,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_AND, WINED3DSIH_BEM, WINED3DSIH_BFI, + WINED3DSIH_BFREV, WINED3DSIH_BREAK, WINED3DSIH_BREAKC, WINED3DSIH_BREAKP,

1 0

Józef Kucia : wined3d: Implement SM5 emit_stream instruction for stream 0.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: df557182be860eb3b323ff4b0233784a2300dfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df557182be860eb3b323ff4b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:34 2016 +0200 wined3d: Implement SM5 emit_stream instruction for stream 0. 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c9c0773..9a2025f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4307,9 +4307,15 @@ static void shader_glsl_else(const struct wined3d_shader_instruction *ins) static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { + unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; + shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); shader_glsl_fixup_position(ins->ctx->buffer); - shader_addline(ins->ctx->buffer, "EmitVertex();\n"); + + if (!stream) + shader_addline(ins->ctx->buffer, "EmitVertex();\n"); + else + FIXME("Unhandled primitive stream %u.\n", stream); } static void shader_glsl_break(const struct wined3d_shader_instruction *ins) @@ -8644,7 +8650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, - /* WINED3DSIH_EMIT_STREAM */ NULL, + /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end,

1 0

Józef Kucia : wined3d: Implement SM5 cut_stream instruction for stream 0.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 422f0a87c48f595ca512d5278c4f3631e0aa599c URL: http://source.winehq.org/git/wine.git/?a=commit;h=422f0a87c48f595ca512d5278… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:35 2016 +0200 wined3d: Implement SM5 cut_stream instruction for stream 0. 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a2025f..7ad5acd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3437,7 +3437,12 @@ static void shader_glsl_cross(const struct wined3d_shader_instruction *ins) static void shader_glsl_cut(const struct wined3d_shader_instruction *ins) { - shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); + unsigned int stream = ins->handler_idx == WINED3DSIH_CUT ? 0 : ins->src[0].reg.idx[0].offset; + + if (!stream) + shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); + else + FIXME("Unhandled primitive stream %u.\n", stream); } /* Process the WINED3DSIO_POW instruction in GLSL (dst = |src0|^src1) @@ -8600,7 +8605,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CONTINUE */ shader_glsl_continue, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, - /* WINED3DSIH_CUT_STREAM */ NULL, + /* WINED3DSIH_CUT_STREAM */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop,

1 0