January 2015 - Wine-commits

Nikolay Sivov : dwrite: Implement GetClusterMetrics().
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: e292385fcd80c897ebff3f17f3a85400c4a6a149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e292385fcd80c897ebff3f17f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 13:56:27 2015 +0300 dwrite: Implement GetClusterMetrics(). --- dlls/dwrite/layout.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 785ded8..88a83cc 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1704,13 +1704,17 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); HRESULT hr; - FIXME("(%p)->(%p %u %p): stub\n", This, metrics, max_count, count); + TRACE("(%p)->(%p %u %p)\n", This, metrics, max_count, count); hr = layout_compute(This); if (FAILED(hr)) return hr; - return E_NOTIMPL; + if (metrics) + memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); + + *count = This->clusters_count; + return max_count < This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width)

1 0

Nikolay Sivov : dwrite/tests: Additional test for Draw().
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: aef50786fb5df36002cf06426ed53fb29208916f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef50786fb5df36002cf06426… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 08:13:12 2015 +0300 dwrite/tests: Additional test for Draw(). --- dlls/dwrite/tests/layout.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 1a1cfd9..760c34f 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -785,7 +785,17 @@ static const struct drawcall_entry draw_seq[] = { { DRAW_LAST_KIND } }; -static void test_draw_sequence(void) +static const struct drawcall_entry draw_seq2[] = { + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_GLYPHRUN }, + { DRAW_LAST_KIND } +}; + +static void test_Draw(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR ruW[] = {'r','u',0}; @@ -831,9 +841,20 @@ static void test_draw_sequence(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); + IDWriteTextLayout_Release(layout); + + /* with reduced width DrawGlyphRun() is called for every line */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 5.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_seq2, "draw test 2", TRUE); - IDWriteTextFormat_Release(format); IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); } static void test_typography(void) @@ -1010,7 +1031,7 @@ START_TEST(layout) test_CreateEllipsisTrimmingSign(); test_fontweight(); test_SetInlineObject(); - test_draw_sequence(); + test_Draw(); test_typography(); test_GetClusterMetrics(); test_SetLocaleName();

1 0

Nikolay Sivov : hnetcfg: Release typeinfos and typelib on dll unload.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 4782be7e31c1a605d5dc5ea619a06ddcec75e26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4782be7e31c1a605d5dc5ea61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 14 13:39:22 2015 +0300 hnetcfg: Release typeinfos and typelib on dll unload. --- dlls/hnetcfg/apps.c | 12 ++++++++++++ dlls/hnetcfg/hnetcfg.c | 8 ++++++-- dlls/hnetcfg/hnetcfg_private.h | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index a0530e1..d21ed98 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -148,6 +148,18 @@ HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +void release_typelib(void) +{ + unsigned i; + + for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++) + if (typeinfo[i]) + ITypeInfo_Release(typeinfo[i]); + + if (typelib) + ITypeLib_Release(typelib); +} + static HRESULT WINAPI fw_app_GetTypeInfo( INetFwAuthorizedApplication *iface, UINT iTInfo, diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index 809b540..fadd367 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -114,9 +114,9 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_WINE_PREATTACH: @@ -125,6 +125,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); + break; } return TRUE; } diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 1045347..6fe69d5 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -28,6 +28,7 @@ enum type_id }; HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN; +void release_typelib(void) DECLSPEC_HIDDEN; HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : msxml3: Remove child node in one place in node_insert_before().
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: fd925d0e5b477f8b99260596b88b33a85770cf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd925d0e5b477f8b99260596b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 17 20:22:48 2015 +0300 msxml3: Remove child node in one place in node_insert_before(). --- dlls/msxml3/node.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 47d3159..92063be 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -477,15 +477,19 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT xmlnode *before_node_obj = get_node_obj(before); IXMLDOMNode_Release(before); if(!before_node_obj) return E_FAIL; + } - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } + /* unlink from current parent first */ + if(node_obj->parent) + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; - doc = node_obj->node->doc; + if(before) + { + xmlnode *before_node_obj = get_node_obj(before); /* refs count including subtree */ if (doc != before_node_obj->node->doc) @@ -498,14 +502,6 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT } else { - /* unlink from current parent first */ - if(node_obj->parent) - { - hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); - } - doc = node_obj->node->doc; - if (doc != This->node->doc) refcount = xmlnode_get_inst_cnt(node_obj);

1 0

Bruno Jesus : user32: Allocate memory based on HICON instead of DWORD to fix 64 bit problems.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: da8bb1c4a5565b332159c8b9ee3d3b4378b80e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8bb1c4a5565b332159c8b9e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 17 20:51:07 2015 -0200 user32: Allocate memory based on HICON instead of DWORD to fix 64 bit problems. --- dlls/user32/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3c31894..8504bdc 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1165,7 +1165,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, cursor = alloc_icon_handle( TRUE, header.num_steps ); if (!cursor) return 0; - frames = HeapAlloc( GetProcessHeap(), 0, sizeof(DWORD)*header.num_frames ); + frames = HeapAlloc( GetProcessHeap(), 0, sizeof(*frames) * header.num_frames ); if (!frames) { free_icon_handle( cursor );

1 0

Changhui Liu : gdiplus: Fix get_graphics_bounds when window origin point changed.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 5fa7402a36ee0e1238434598ff589e3de42f80cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa7402a36ee0e1238434598f… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Mon Dec 22 16:43:47 2014 +0800 gdiplus: Fix get_graphics_bounds when window origin point changed. --- dlls/gdiplus/graphics.c | 3 +-- dlls/gdiplus/tests/graphics.c | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 840d866..68a4ee5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2029,8 +2029,7 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); } - if (graphics->hdc && - (GetMapMode(graphics->hdc) != MM_TEXT || GetGraphicsMode(graphics->hdc) != GM_COMPATIBLE)) + if (graphics->hdc) { POINT points[2]; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8ce372b..fd4cf80 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5548,6 +5548,61 @@ static void test_GdipFillRectangles(void) ReleaseDC(hwnd, hdc); } +static void test_GdipGetVisibleClipBounds_memoryDC(void) +{ + HDC hdc,dc; + HBITMAP bmp; + HGDIOBJ old; + RECT rect; + POINT pt; + int width = 0; + int height = 0; + GpGraphics* graphics = NULL; + GpRect boundRect; + GpStatus status; + + ok(GetClientRect(hwnd, &rect), "GetClientRect should have succeeded\n"); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + dc = GetDC(hwnd); + hdc = CreateCompatibleDC ( dc ); + bmp = CreateCompatibleBitmap ( dc, width, height ); + old = SelectObject (hdc, bmp); + + /*change the window origin is the key test point*/ + SetWindowOrgEx (hdc, rect.left+10, rect.top+10, &pt); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipGetVisibleClipBoundsI(graphics, &boundRect); + expect(Ok, status); + + ok(boundRect.X==rect.left+10 && + boundRect.Y==rect.top+10 && + boundRect.Width==width && + boundRect.Height==height, "Expected GdipGetVisibleClipBoundsI ok\n"); + + status = GdipSetClipRectI(graphics, 0, 0, width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipGetVisibleClipBoundsI(graphics, &boundRect); + expect(Ok, status); + + ok(boundRect.X==rect.left+10 && + boundRect.Y==rect.top+10 && + boundRect.Width==width-10 && + boundRect.Height==height-10, "Expected GdipGetVisibleClipBoundsI ok\n"); + + GdipDeleteGraphics(graphics); + + SelectObject (hdc, old); + DeleteObject (bmp); + DeleteDC (hdc); + ReleaseDC(hwnd, dc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -5619,6 +5674,7 @@ START_TEST(graphics) test_alpha_hdc(); test_bitmapfromgraphics(); test_GdipFillRectangles(); + test_GdipGetVisibleClipBounds_memoryDC(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Henri Verbeet : wined3d: Use the same flags for wined3d_texture_set_color_key() and the " color_key_flags" field it sets.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: ca06f960edc0e1216eaa655c9a2eaf061af11afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca06f960edc0e1216eaa655c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:11 2015 +0100 wined3d: Use the same flags for wined3d_texture_set_color_key() and the "color_key_flags" field it sets. This fixes a regression introduced by commit a8ab56941577a01e17b947cddd374ba52ffd8245. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/surface.c | 14 +++++++------- dlls/wined3d/texture.c | 42 +++++++++++++++++++++--------------------- dlls/wined3d/utils.c | 4 ++-- include/wine/wined3d.h | 35 ++++++----------------------------- 6 files changed, 39 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca06f960edc0e1216eaa6…

1 0

Henri Verbeet : wined3d: Properly cleanup samplers on wined3d_device_reset () / wined3d_device_uninit_3d().
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 525696fe6c4c54888255783cd1be4439ae700fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=525696fe6c4c54888255783cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:12 2015 +0100 wined3d: Properly cleanup samplers on wined3d_device_reset() / wined3d_device_uninit_3d(). --- dlls/wined3d/device.c | 9 ++++----- include/wine/rbtree.h | 8 ++++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 29ce04f..f640c9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1032,9 +1032,8 @@ err_out: static void device_free_sampler(struct wine_rb_entry *entry, void *context) { struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); - struct wined3d_device *device = context; - wine_rb_remove(&device->samplers, &sampler->desc); + wined3d_sampler_decref(sampler); } HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) @@ -1071,7 +1070,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) resource->resource_ops->resource_unload(resource); } - wine_rb_for_each_entry(&device->samplers, device_free_sampler, device); + wine_rb_clear(&device->samplers, device_free_sampler, NULL); /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader * private data, it might contain opengl pointers @@ -4632,6 +4631,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->exStyle = exStyle; } + wine_rb_clear(&device->samplers, device_free_sampler, NULL); + if (reset_state) { TRACE("Resetting stateblock.\n"); @@ -4677,8 +4678,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain_update_render_to_fbo(swapchain); swapchain_update_draw_bindings(swapchain); - wine_rb_for_each_entry(&device->samplers, device_free_sampler, device); - if (reset_state && device->d3d_initialized) hr = create_primary_opengl_context(device, swapchain); diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 2276e30..13452d9 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -220,12 +220,16 @@ static inline void wine_rb_for_each_entry(struct wine_rb_tree *tree, wine_rb_tra wine_rb_postorder(tree, callback, context); } -static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +static inline void wine_rb_clear(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { /* Note that we use postorder here because the callback will likely free the entry. */ if (callback) wine_rb_postorder(tree, callback, context); - tree->root = NULL; +} + +static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +{ + wine_rb_clear(tree, callback, context); tree->functions->free(tree->stack.entries); }

1 0

Henri Verbeet : wined3d: Handle the SM4 SV_POSITION pixel shader input semantic in the GLSL shader backend.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 2912e2938e475a125db5aa33598607696b3e61ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2912e2938e475a125db5aa335… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:09 2015 +0100 wined3d: Handle the SM4 SV_POSITION pixel shader input semantic in the GLSL shader backend. This is (mostly) equivalent to the vPos register in SM3. --- dlls/wined3d/glsl_shader.c | 29 ++++++++++++++++------------- dlls/wined3d/shader.c | 3 +++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index efae51e..8f5e916 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1191,14 +1191,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); if (use_vs(state)) - shader_addline(buffer, "varying vec4 %s_in[%u];\n", prefix, in_count); - else - /* TODO: Write a replacement shader for the fixed function - * vertex pipeline, so this isn't needed. For fixed function - * vertex processing + 3.0 pixel shader we need a separate - * function in the pixel shader that reads the fixed function - * color into the packed input registers. */ - shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); + shader_addline(buffer, "varying vec4 %s_link[%u];\n", prefix, in_count); + shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) @@ -4154,7 +4148,16 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w semantic_idx = input_signature[i].semantic_idx; shader_glsl_write_mask_to_str(input_signature[i].mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) + if (vertexprocessing == vertexshader) + { + if (!strcmp(semantic_name, "SV_POSITION")) + shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", + shader->u.ps.input_reg_map[i], reg_mask, reg_mask); + else + shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", + shader->u.ps.input_reg_map[i], reg_mask, shader->u.ps.input_reg_map[i], reg_mask); + } + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) { if (semantic_idx < 8 && vertexprocessing == pretransformed) shader_addline(buffer, "ps_in[%u]%s = gl_TexCoord[%u]%s;\n", @@ -4276,7 +4279,7 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, else if (in_idx == in_count + 1) sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_in[%u]", in_idx); + sprintf(destination, "ps_link[%u]", in_idx); semantic_name_in = input_signature[i].semantic_name; semantic_idx_in = input_signature[i].semantic_idx; @@ -4322,7 +4325,7 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, else if (i == in_count + 1) sprintf(destination, "gl_FrontSecondaryColor"); else - sprintf(destination, "ps_in[%u]", i); + sprintf(destination, "ps_link[%u]", i); if (size == 1) shader_addline(buffer, "%s.%s = 0.0;\n", destination, reg_mask); else shader_addline(buffer, "%s.%s = vec%u(0.0);\n", destination, reg_mask, size); @@ -4406,7 +4409,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer { UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); /* This one is tricky: a 3.0 pixel shader reads from a 3.0 vertex shader */ - shader_addline(buffer, "varying vec4 ps_in[%u];\n", in_count); + shader_addline(buffer, "varying vec4 ps_link[%u];\n", in_count); shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits->packed_output); /* First, sort out position and point size. Those are not passed to the pixel shader */ @@ -4517,7 +4520,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); /* Pack 3.0 inputs */ - if (reg_maps->shader_version.major >= 3 && args->vp_mode != vertexshader) + if (reg_maps->shader_version.major >= 3) shader_glsl_input_pack(shader, buffer, shader->input_signature, reg_maps, args->vp_mode); /* Base Shader Body */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7218290..e1164db 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2506,6 +2506,9 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de memcpy(ptr, e->semantic_name, len + 1); shader->input_signature[e->register_idx].semantic_name = ptr; ptr += len + 1; + + if (!strcmp(e->semantic_name, "SV_POSITION")) + shader->reg_maps.vpos = 1; } }

1 0

Henri Verbeet : d3d10core/tests: Add a basic texturing test.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 6b4623008f885e25e77b1b367e0949b1b5b13ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4623008f885e25e77b1b367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:10 2015 +0100 d3d10core/tests: Add a basic texturing test. --- dlls/d3d10core/tests/device.c | 215 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 76830a4..8b51cda 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2305,6 +2305,220 @@ done: DestroyWindow(window); } +static void test_texture(void) +{ + ID3D10RenderTargetView *backbuffer_rtv; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10SamplerState *sampler_state; + ID3D10ShaderResourceView *ps_srv; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10InputLayout *input_layout; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *backbuffer; + unsigned int stride, offset; + IDXGISwapChain *swapchain; + ID3D10Texture2D *texture; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + D3D10_VIEWPORT vp; + unsigned int i, j; + ID3D10Buffer *vb; + ULONG refcount; + DWORD color; + HWND window; + HRESULT hr; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const struct + { + float x, y; + } + quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = 4 * sizeof(*bitmap_data); + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &ps_srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &backbuffer_rtv, NULL); + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_PSSetShaderResources(device, 0, 1, &ps_srv); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); + ID3D10Device_PSSetShader(device, ps); + + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + ID3D10Device_ClearRenderTargetView(device, backbuffer_rtv, red); + + ID3D10Device_Draw(device, 4, 0); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_texture_color(backbuffer, 80 + j * 160, 60 + i * 120); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10SamplerState_Release(sampler_state); + ID3D10ShaderResourceView_Release(ps_srv); + ID3D10Texture2D_Release(texture); + ID3D10Buffer_Release(vb); + ID3D10InputLayout_Release(input_layout); + ID3D10RenderTargetView_Release(backbuffer_rtv); + ID3D10Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(device) { test_create_texture2d(); @@ -2322,4 +2536,5 @@ START_TEST(device) test_scissor(); test_clear_state(); test_blend(); + test_texture(); }

1 0