February 2017 - Wine-commits

Zebediah Figura : storage.dll16: Fix get_nth_next_small_blocknr.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: e3781c84ab24772b84dc8e0f9e92581ba44c1daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3781c84ab24772b84dc8e0f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 23 13:34:07 2017 -0600 storage.dll16: Fix get_nth_next_small_blocknr. Dividing the initial value of -1 by 128 yields 0, causing the assertion to fail whenever the function is called with nr > 0 and blocknr < 128. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 5969333..865411f 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -600,7 +600,7 @@ STORAGE_get_next_small_blocknr(stream_access16 *str,int blocknr) { */ static int STORAGE_get_nth_next_small_blocknr(stream_access16*str,int blocknr,int nr) { - int lastblocknr=-1; + int lastblocknr=-129; BYTE block[BIGSIZE]; LPINT sbd = (LPINT)block; struct storage_header sth;

1 0

Alistair Leslie-Hughes : dpnet: Handle unknown service GUID in enum_services_providers.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 83cce966f4cc4692035b18bf0766caa630702b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cce966f4cc4692035b18bf0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 24 06:45:29 2017 +0000 dpnet: Handle unknown service GUID in enum_services_providers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 4 ++-- dlls/dpnet/tests/client.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 91a7e3e..e8a60c3 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -147,10 +147,10 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER if(!returned || !buf_size) return E_POINTER; - *returned = 0; - if(!service) { + *returned = 0; + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceproviders, 0, KEY_READ, &key); if(res == ERROR_FILE_NOT_FOUND) return DPNERR_DOESNOTEXIST; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index ee2722b..6503bc3 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -211,6 +211,12 @@ static void test_enum_service_providers(void) } ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Client_EnumServiceProviders(client, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); } static void test_enum_hosts(void) @@ -571,6 +577,12 @@ static void test_enum_service_providers_peer(void) serv_prov_info -= items; /* set pointer back */ ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Peer_EnumServiceProviders(peer, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); } static void test_enum_hosts_peer(void)

1 0

Hugh McMaster : regedit/tests: Test import with non-standard registry file headers.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 00bd109e1f7adf4018df29947b07a2e68ac85a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bd109e1f7adf4018df29947… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 24 11:33:49 2017 +0000 regedit/tests: Test import with non-standard registry file headers. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f369b59..c82dfe3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -415,6 +415,62 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "MixedQuotes"); verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + /* Test import with non-standard registry file headers */ + exec_import_str("REGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test1"); + + exec_import_str("regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test2"); + + exec_import_str("Regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test3"); + + exec_import_str("REGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test4"); + + exec_import_str("REGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test5"); + + exec_import_str("REGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test6"); + + exec_import_str("REGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test7"); + + exec_import_str("Windows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test8"); + + exec_import_str("Windows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test9"); + + exec_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test10"); + + exec_import_str("Windows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test11"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Test import with non-standard registry file headers.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: c3a46653e1e91e5922a77470eba9619df911c1d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a46653e1e91e5922a77470e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Feb 24 11:34:02 2017 +0000 reg/tests: Test import with non-standard registry file headers. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8786b0f..7c79b31 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -875,6 +875,84 @@ static void test_import(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_str("REGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test1"); + + test_import_str("regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test2"); + + test_import_str("Regedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test3"); + + test_import_str("REGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test4"); + + test_import_str("REGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test5"); + + test_import_str("REGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test6"); + + test_import_str("REGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test7"); + + test_import_str("REGEDIT9\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test8"); + + test_import_str("Windows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test9"); + + test_import_str("Windows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test10"); + + test_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test11"); + + test_import_str("Windows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test12"); + test_import_str("REGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value1\"\n", &r); @@ -1159,6 +1237,56 @@ static void test_import(void) err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test1"); + + test_import_wstr("\xef\xbb\xbfregedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test2"); + + test_import_wstr("\xef\xbb\xbfRegedit4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test3"); + + test_import_wstr("\xef\xbb\xbfREGEDIT 4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test4"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test5"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4 FOO\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test6"); + + test_import_wstr("\xef\xbb\xbfREGEDIT5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test7\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test7"); + + test_import_wstr("\xef\xbb\xbfREGEDIT9\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test8\"=\"Value\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test8"); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode1\"=\"Value1\"\n", &r); @@ -1209,6 +1337,34 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 4.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test9\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test9"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test10\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test10"); + + test_import_wstr("\xef\xbb\xbfWINDOWS REGISTRY EDITOR VERSION 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test11"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12\"=\"Value\"\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + todo_wine verify_reg_nonexist(hkey, "Test12"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode4\"=\"Value4\"\n", &r);

1 0

Nikolay Sivov : d2d1: Use DrawLine() to draw underlines.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: d51c60e11dbe4c85feed37df36dc98be1f8478ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51c60e11dbe4c85feed37df3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 14:11:33 2017 +0300 d2d1: Use DrawLine() to draw underlines. 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/d2d1/render_target.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a9f7485..cc705ee 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1818,24 +1818,24 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; - float min_thickness; + D2D1_POINT_2F start, end; ID2D1Brush *brush; - D2D1_RECT_F rect; + float thickness; TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p\n", iface, ctx, baseline_origin_x, baseline_origin_y, underline, effect); /* minimal thickness in DIPs that will result in at least 1 pixel thick line */ - min_thickness = 96.0f / (render_target->desc.dpiY * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)); - - rect.left = baseline_origin_x; - rect.top = baseline_origin_y + underline->offset; - rect.right = baseline_origin_x + underline->width; - rect.bottom = baseline_origin_y + underline->offset + max(underline->thickness, min_thickness); + thickness = max(96.0f / (render_target->desc.dpiY * sqrtf(m->_21 * m->_21 + m->_22 * m->_22)), + underline->thickness); brush = d2d_draw_get_text_brush(context, effect); - ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, brush); + start.x = baseline_origin_x; + start.y = baseline_origin_y + underline->offset + thickness / 2.0f; + end.x = start.x + underline->width; + end.y = start.y; + d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); ID2D1Brush_Release(brush);

1 0

Józef Kucia : wined3d: Extract common code to validate_shader_resource_view().
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: f0bff11738b0858d370e2e7eefff03de0488df72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bff11738b0858d370e2e7ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:35 2017 +0100 wined3d: Extract common code to validate_shader_resource_view(). 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/view.c | 214 ++++++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 131 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b64b5e7..a74a2ea 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -68,6 +68,82 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, return texture->target; } +static const struct wined3d_format *validate_shader_resource_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, BOOL mip_slice) +{ + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + const struct wined3d_format *format; + + format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + if (resource->type == WINED3D_RTYPE_BUFFER && (desc->flags & WINED3D_VIEW_BUFFER_RAW)) + { + if (format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(format->id)); + return NULL; + } + + format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } + + if (wined3d_format_is_typeless(format)) + { + WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(format->id)); + return NULL; + } + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int buffer_size, element_size; + + if (buffer->desc.structure_byte_stride) + { + if (desc->format_id != WINED3DFMT_UNKNOWN) + { + WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); + return NULL; + } + + format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + element_size = buffer->desc.structure_byte_stride; + } + else + { + element_size = format->byte_count; + } + + if (!element_size) + return NULL; + + buffer_size = buffer->resource.size / element_size; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return NULL; + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (mip_slice && resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (!desc->u.texture.level_count + || (mip_slice && desc->u.texture.level_count != 1) + || desc->u.texture.level_idx >= texture->level_count + || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx + || !desc->u.texture.layer_count + || desc->u.texture.layer_idx >= depth_or_layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) + return NULL; + } + + return format; +} + static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, const struct wined3d_view_desc *desc, struct wined3d_texture *texture, const struct wined3d_format *view_format) @@ -524,76 +600,16 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - const struct wined3d_format *view_format; - - view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - if (view_format->id != WINED3DFMT_R32_TYPELESS) - { - WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view_format->id)); - return E_INVALIDARG; - } - - view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - } - - if (wined3d_format_is_typeless(view_format)) - { - WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); - return E_INVALIDARG; - } - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int buffer_size, element_size; - - if (buffer->desc.structure_byte_stride) - { - if (desc->format_id != WINED3DFMT_UNKNOWN) - { - WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); - return E_INVALIDARG; - } - - view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; - } - else - { - element_size = view_format->byte_count; - } - - if (!element_size) - return E_INVALIDARG; - - buffer_size = buffer->resource.size / element_size; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) - return E_INVALIDARG; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - - if (!desc->u.texture.level_count - || desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx - || !desc->u.texture.layer_count - || desc->u.texture.layer_idx >= texture->layer_count - || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) - return E_INVALIDARG; - } - view->refcount = 1; - wined3d_resource_incref(view->resource = resource); view->parent = parent; view->parent_ops = parent_ops; - view->format = view_format; + + if (!(view->format = validate_shader_resource_view(desc, resource, FALSE))) + return E_INVALIDARG; view->desc = *desc; + wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); return WINED3D_OK; @@ -746,78 +762,14 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - view->refcount = 1; view->parent = parent; view->parent_ops = parent_ops; - view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - view->desc = *desc; - - if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - if (view->format->id != WINED3DFMT_R32_TYPELESS) - { - WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view->format->id)); - return E_INVALIDARG; - } - - view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - } - - if (wined3d_format_is_typeless(view->format)) - { - WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + if (!(view->format = validate_shader_resource_view(desc, resource, TRUE))) return E_INVALIDARG; - } - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int buffer_size, element_size; - - if (buffer->desc.structure_byte_stride) - { - if (desc->format_id != WINED3DFMT_UNKNOWN) - { - WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); - return E_INVALIDARG; - } - - view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; - } - else - { - element_size = view->format->byte_count; - } - - if (!element_size) - return E_INVALIDARG; - - buffer_size = buffer->resource.size / element_size; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) - return E_INVALIDARG; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int depth_or_layer_count; - - if (resource->type == WINED3D_RTYPE_TEXTURE_3D) - depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); - else - depth_or_layer_count = texture->layer_count; + view->desc = *desc; - if (desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count != 1 - || desc->u.texture.layer_idx >= depth_or_layer_count - || !desc->u.texture.layer_count - || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) - return E_INVALIDARG; - } wined3d_resource_incref(view->resource = resource); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view);

1 0

Józef Kucia : wined3d: Use string_buffer_sprintf() in shader_glsl_sprintf_cast().
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: bff1ecac3bcd357d508a2c8a5587a11ed4c6a54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff1ecac3bcd357d508a2c8a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:36 2017 +0100 wined3d: Use string_buffer_sprintf() in shader_glsl_sprintf_cast(). 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, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8bdba0..eefc248 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2955,12 +2955,12 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); } -static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_str, +static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, const char *src_param, enum wined3d_data_type dst_data_type, enum wined3d_data_type src_data_type) { if (dst_data_type == src_data_type) { - sprintf(dst_param_str, "%s", src_param_str); + string_buffer_sprintf(dst_param, "%s", src_param); return; } @@ -2969,12 +2969,12 @@ static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_ switch (dst_data_type) { case WINED3D_DATA_INT: - sprintf(dst_param_str, "floatBitsToInt(%s)", src_param_str); + string_buffer_sprintf(dst_param, "floatBitsToInt(%s)", src_param); return; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(dst_param_str, "floatBitsToUint(%s)", src_param_str); + string_buffer_sprintf(dst_param, "floatBitsToUint(%s)", src_param); return; default: break; @@ -2983,18 +2983,18 @@ static void shader_glsl_sprintf_cast(char *dst_param_str, const char *src_param_ if (src_data_type == WINED3D_DATA_UINT && dst_data_type == WINED3D_DATA_FLOAT) { - sprintf(dst_param_str, "uintBitsToFloat(%s)", src_param_str); + string_buffer_sprintf(dst_param, "uintBitsToFloat(%s)", src_param); return; } if (src_data_type == WINED3D_DATA_INT && dst_data_type == WINED3D_DATA_FLOAT) { - sprintf(dst_param_str, "intBitsToFloat(%s)", src_param_str); + string_buffer_sprintf(dst_param, "intBitsToFloat(%s)", src_param); return; } FIXME("Unhandled cast from %#x to %#x.\n", src_data_type, dst_data_type); - sprintf(dst_param_str, "%s", src_param_str); + string_buffer_sprintf(dst_param, "%s", src_param); } /* From a given parameter token, generate the corresponding GLSL string. @@ -3004,10 +3004,11 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, enum wined3d_data_type data_type) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; - char reg_name[200]; glsl_src->reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; @@ -3036,7 +3037,9 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio } shader_glsl_sprintf_cast(reg_name, glsl_src->reg_name, data_type, param_data_type); - shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name, swizzle_str, glsl_src->param_str); + shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name->buffer, swizzle_str, glsl_src->param_str); + + string_buffer_release(priv->string_buffers, reg_name); } static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins,

1 0

Józef Kucia : wined3d: Record sampler usage for ld_structured.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 5392835f2992eb43b45e40de425ebd9d3f0d42e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5392835f2992eb43b45e40de4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:37 2017 +0100 wined3d: Record sampler usage for ld_structured. 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/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3085248..37c4352 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1385,6 +1385,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); } + else if (ins.handler_idx == WINED3DSIH_LD_STRUCTURED + && ins.src[2].reg.type == WINED3DSPR_RESOURCE) + { + shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, + WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); + } if (ins.predicate) if (!shader_record_register_usage(shader, reg_maps, &ins.predicate->reg,

1 0

Józef Kucia : wined3d: Handle structured resource declarations.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 7cdd18f392882de4d779129d8e519b3dd3830305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdd18f392882de4d779129d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:38 2017 +0100 wined3d: Handle structured resource declarations. 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 | 2 +- dlls/wined3d/shader.c | 13 +++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eefc248..28a3b3b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9364,7 +9364,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_STREAM */ NULL, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 37c4352..14cb243 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1025,6 +1025,19 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; } + else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.structured_resource.reg.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", reg_idx); + break; + } + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; + reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; + reg_maps->resource_info[reg_idx].flags = 0; + reg_maps->resource_info[reg_idx].stride = ins.declaration.structured_resource.byte_stride / 4; + } else if (ins.handler_idx == WINED3DSIH_DCL_SAMPLER) { if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 877b27d..26aacc7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -780,6 +780,8 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru { shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); ins->declaration.structured_resource.byte_stride = *tokens; + if (ins->declaration.structured_resource.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); } static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins,

1 0

Józef Kucia : wined3d: Implement ld_structured instruction.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 38e2a5ee22199dcd6dde82730bf4c22bb78defe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e2a5ee22199dcd6dde82730… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 24 12:27:39 2017 +0100 wined3d: Implement ld_structured 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 | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 28a3b3b..8345888 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5068,28 +5068,51 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } -static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) +static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); - const struct wined3d_shader_src_param *src = &ins->src[1]; + const struct wined3d_shader_src_param *src = &ins->src[ins->src_count - 1]; + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + unsigned int i, swizzle, resource_idx, stride, src_idx = 0; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param structure_idx, offset; + struct wined3d_string_buffer *address; struct wined3d_shader_dst_param dst; const char *function, *resource; - struct glsl_src_param offset; - unsigned int i, swizzle; + resource_idx = src->reg.idx[0].offset; if (src->reg.type == WINED3DSPR_RESOURCE) { + if (resource_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", resource_idx); + return; + } + stride = reg_maps->resource_info[resource_idx].stride; function = "texelFetch"; resource = "sampler"; } else { + if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", resource_idx); + return; + } + stride = reg_maps->uav_resource_info[resource_idx].stride; function = "imageLoad"; resource = "image"; } - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &offset); + address = string_buffer_get(priv->string_buffers); + if (ins->handler_idx == WINED3DSIH_LD_STRUCTURED) + { + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx); + shader_addline(address, "%s * %u + ", structure_idx.param_str, stride); + } + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset); + shader_addline(address, "%s / 4", offset.param_str); dst = ins->dst[0]; for (i = 0; i < 4; ++i) @@ -5099,9 +5122,11 @@ static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) continue; swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); - shader_addline(buffer, "%s(%s_%s%u, %s / 4 + %u).x);\n", - function, prefix, resource, src->reg.idx[0].offset, offset.param_str, swizzle); + shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", + function, prefix, resource, src->reg.idx[0].offset, address->buffer, swizzle); } + + string_buffer_release(priv->string_buffers, address); } static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) @@ -5139,8 +5164,8 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param structure_idx, offset, data; struct wined3d_string_buffer *address; @@ -9450,8 +9475,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw, - /* WINED3DSIH_LD_STRUCTURED */ NULL, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_buffer, + /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_buffer, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOD */ NULL,

1 0