March 2017 - Wine-commits - list.winehq.org

Henri Verbeet : usp10: Avoid LPOUTLINETEXTMETRICW.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ba66b626ebb1b626f0ce32ef31f5b6e1f02af146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba66b626ebb1b626f0ce32ef3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:47 2017 +0100 usp10: Avoid LPOUTLINETEXTMETRICW. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 51 ++++++++++++++++++++++++++++----------------- dlls/usp10/shape.c | 8 ++++--- dlls/usp10/usp10_internal.h | 4 +++- 3 files changed, 40 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba66b626ebb1b626f0ce3…

1 0

Nikolay Sivov : xmllite/tests: Added missing return value check (Coverity) .
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: fc68269a5205afe4e48561390405d493d30312da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc68269a5205afe4e48561390… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 20 08:30:48 2017 +0300 xmllite/tests: Added missing return value check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 82880ae..b2fa65b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2578,7 +2578,8 @@ static void test_reader_position(void) ok(type == XmlNodeType_EndElement, "got type %d\n", type); TEST_READER_POSITION2(reader, 2, 3, 2, 6); - IXmlReader_SetInput(reader, NULL); + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "got %08x\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); TEST_READER_POSITION(reader, 0, 0);

1 0

Hugh McMaster : comctl32/tests: Move the WineTest subkey in toolbar.c into HKEY_CURRENT_USER\Software\Wine.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 6797ee0abfdb33fe444a7c6f9b0f1559b72e16c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6797ee0abfdb33fe444a7c6f9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 20 11:57:51 2017 +0000 comctl32/tests: Move the WineTest subkey in toolbar.c into HKEY_CURRENT_USER\Software\Wine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index a8bcd40..2d12732 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2276,7 +2276,8 @@ static void test_save(void) { HWND wnd = NULL; TBSAVEPARAMSW params; - static const WCHAR subkey[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','T','e','s','t',0}; + static const WCHAR subkey[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'W','i','n','e','T','e','s','t',0}; static const WCHAR value[] = {'t','o','o','l','b','a','r','t','e','s','t',0}; LONG res; HKEY key;

1 0

Jacek Caban : xmllite: Return WC_E_SYNTAX if there is unexpected data in the end of the stream.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 68aeee4d79ea88b0d36cd76aa301d83516b8421b URL: http://source.winehq.org/git/wine.git/?a=commit;h=68aeee4d79ea88b0d36cd76aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 20 14:01:00 2017 +0100 xmllite: Return WC_E_SYNTAX if there is unexpected data in the end of the stream. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 13 ++++++++----- dlls/xmllite/tests/reader.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b28a4b1..7c9f76a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2610,14 +2610,17 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) return reader_parse_content(reader); case XmlReadInState_MiscEnd: hr = reader_parse_misc(reader); - if (FAILED(hr)) return hr; + if (hr != S_FALSE) return hr; - if (hr == S_FALSE) + if (*reader_get_ptr(reader)) { - reader->instate = XmlReadInState_Eof; - reader->state = XmlReadState_EndOfFile; - reader->nodetype = XmlNodeType_None; + WARN("found garbage in the end of XML\n"); + return WC_E_SYNTAX; } + + reader->instate = XmlReadInState_Eof; + reader->state = XmlReadState_EndOfFile; + reader->nodetype = XmlNodeType_None; return hr; case XmlReadInState_Eof: return S_FALSE; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index b2fa65b..c710894 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2354,6 +2354,7 @@ static void test_eof_state(IXmlReader *reader, BOOL eof) static void test_endoffile(void) { static const char *xml = "<a/>"; + static const char *xml_garbageend = "<a/>text"; IXmlReader *reader; XmlNodeType type; IStream *stream; @@ -2393,6 +2394,33 @@ static void test_endoffile(void) IStream_Release(stream); IXmlReader_Release(reader); + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(xml_garbageend, strlen(xml_garbageend)); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %#x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected type %d\n", type); + + test_eof_state(reader, FALSE); + + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == WC_E_SYNTAX, "got %#x\n", hr); + ok(type == XmlNodeType_None, "Unexpected type %d\n", type); + + test_eof_state(reader, FALSE); + + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + IXmlReader_Release(reader); } static void test_max_element_depth(void)

1 0

Jacek Caban : xmllite: Fixed buffer handling in reader_parse_reference.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: a3d78064d981ca4e1fa3d0ebe2adcbccdb9a8cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d78064d981ca4e1fa3d0ebe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 20 14:01:11 2017 +0100 xmllite: Fixed buffer handling in reader_parse_reference. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 1 + dlls/xmllite/tests/reader.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 7c9f76a..c33d9bf 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2122,6 +2122,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); memmove(start+1, ptr+1, len); buffer->cur = cur + 1; + buffer->written -= (ptr - start) * sizeof(WCHAR); *start = ch; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c710894..47192f9 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2241,8 +2241,8 @@ static void test_namespaceuri(void) static void test_read_charref(void) { - static const char testA[] = "<a b=\"c\">ǳă</a>"; - static const WCHAR chardataW[] = {0x01f3,0x0103,0}; + static const char testA[] = "<a b=\"c\">ǳă></a>"; + static const WCHAR chardataW[] = {0x01f3,0x0103,'>',0}; const WCHAR *value; IXmlReader *reader; XmlNodeType type; @@ -2252,7 +2252,7 @@ static void test_read_charref(void) hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - stream = create_stream_on_data(testA, sizeof(testA)); + stream = create_stream_on_data(testA, sizeof(testA)-1); hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "got %08x\n", hr); @@ -2272,6 +2272,10 @@ static void test_read_charref(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_EndElement, "Unexpected node type %d\n", type); + hr = IXmlReader_Read(reader, &type); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); + IXmlReader_Release(reader); IStream_Release(stream); }

1 0

Nikolay Sivov : dwrite/tests: Initial test for HasKerningPairs().
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: cfe0f33a4abf882c68259e6148a59d41d28ea0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe0f33a4abf882c68259e614… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 21:29:34 2017 +0300 dwrite/tests: Initial test for HasKerningPairs(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 52c64ab..2bdc024 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -41,6 +41,7 @@ #define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') +#define MS_KERN_TAG DWRITE_MAKE_OPENTYPE_TAG('k','e','r','n') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -6783,6 +6784,80 @@ static void test_HasVerticalGlyphVariants(void) IDWriteFactory_Release(factory); } +static void test_HasKerningPairs(void) +{ + IDWriteFontCollection *syscollection; + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + UINT32 count, i; + HRESULT hr; + + factory = create_factory(); + fontface = create_fontface(factory); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + IDWriteFontFace_Release(fontface); + if (hr != S_OK) { + win_skip("HasKerningPairs() is not supported.\n"); + IDWriteFactory_Release(factory); + return; + } + IDWriteFontFace1_Release(fontface1); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + IDWriteLocalizedStrings *names; + BOOL exists, has_kerningpairs; + IDWriteFontFamily *family; + IDWriteFont *font; + WCHAR nameW[256]; + const void *data; + void *context; + UINT32 size; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + exists = FALSE; + hr = IDWriteFontFace1_TryGetFontTable(fontface1, MS_KERN_TAG, &data, &size, &context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFace1_ReleaseFontTable(fontface1, context); + + has_kerningpairs = IDWriteFontFace1_HasKerningPairs(fontface1); + if (!exists) + ok(!has_kerningpairs, "%s: expected %d, got %d\n", wine_dbgstr_w(nameW), exists, has_kerningpairs); + + IDWriteLocalizedStrings_Release(names); + IDWriteFont_Release(font); + + IDWriteFontFace1_Release(fontface1); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(syscollection); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -6841,6 +6916,7 @@ START_TEST(font) test_GetFontSignature(); test_font_properties(); test_HasVerticalGlyphVariants(); + test_HasKerningPairs(); IDWriteFactory_Release(factory); }

1 0

Józef Kucia : wined3d: Make wined3d samplers usable when ARB_sampler_objects is not available.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 993bcc3e1385190cddc9cff4e26e558e73ee0ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=993bcc3e1385190cddc9cff4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:03 2017 +0100 wined3d: Make wined3d samplers usable when ARB_sampler_objects is not available. 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/sampler.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 72574db..a987a35 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -39,10 +39,13 @@ static void wined3d_sampler_destroy_object(void *object) const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(sampler->device, NULL, 0); - gl_info = context->gl_info; - GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); - context_release(context); + if (sampler->name) + { + context = context_acquire(sampler->device, NULL, 0); + gl_info = context->gl_info; + GL_EXTCALL(glDeleteSamplers(1, &sampler->name)); + context_release(context); + } HeapFree(GetProcessHeap(), 0, sampler); } @@ -115,7 +118,9 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d sampler->device = device; sampler->parent = parent; sampler->desc = *desc; - wined3d_cs_init_object(device->cs, wined3d_sampler_cs_init, sampler); + + if (device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) + wined3d_cs_init_object(device->cs, wined3d_sampler_cs_init, sampler); } HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, @@ -125,9 +130,6 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct TRACE("device %p, desc %p, parent %p, sampler %p.\n", device, desc, parent, sampler); - if (!device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) - return WINED3DERR_INVALIDCALL; - if (desc->address_u < WINED3D_TADDRESS_WRAP || desc->address_u > WINED3D_TADDRESS_MIRROR_ONCE || desc->address_v < WINED3D_TADDRESS_WRAP || desc->address_v > WINED3D_TADDRESS_MIRROR_ONCE || desc->address_w < WINED3D_TADDRESS_WRAP || desc->address_w > WINED3D_TADDRESS_MIRROR_ONCE)

1 0

Józef Kucia : wined3d: Create wined3d sampler for default sampler.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: a7dadf2f95d0cc1e38f76a53b35c75d3075f3b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7dadf2f95d0cc1e38f76a53b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:04 2017 +0100 wined3d: Create wined3d sampler for default sampler. 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/context.c | 2 +- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8029de0..b554b00 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3429,7 +3429,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, } if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler_name = device->default_sampler; + sampler_name = device->default_sampler->name; else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) sampler_name = sampler->name; else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eef9818..ba30d20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -776,20 +776,38 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_sampler_desc desc; + HRESULT hr; - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + desc.address_u = WINED3D_TADDRESS_WRAP; + desc.address_v = WINED3D_TADDRESS_WRAP; + desc.address_w = WINED3D_TADDRESS_WRAP; + memset(desc.border_color, 0, sizeof(desc.border_color)); + desc.mag_filter = WINED3D_TEXF_POINT; + desc.min_filter = WINED3D_TEXF_POINT; + desc.mip_filter = WINED3D_TEXF_NONE; + desc.lod_bias = 0.0f; + desc.min_lod = -1000.0f; + desc.max_lod = 1000.0f; + desc.max_anisotropy = 1; + desc.compare = FALSE; + desc.comparison_func = WINED3D_CMP_NEVER; + desc.srgb_decode = TRUE; + + /* In SM4+ shaders there is a separation between resources and samplers. Some shader + * instructions allow access to resources without using samplers. + * In GLSL, resources are always accessed through sampler or image variables. The default + * sampler object is used to emulate the direct resource access when there is no sampler state + * to use. + */ + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->default_sampler))) { - /* In SM4+ shaders there is a separation between resources and samplers. Some shader - * instructions allow access to resources without using samplers. - * In GLSL, resources are always accessed through sampler or image variables. The default - * sampler object is used to emulate the direct resource access when there is no sampler state - * to use. - */ - GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); - GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); - GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST)); - checkGLcall("Create default sampler"); + ERR("Failed to create default sampler, hr %#x.\n", hr); + device->default_sampler = NULL; + } + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + { /* In D3D10+, a NULL sampler maps to the default sampler state. */ GL_EXTCALL(glGenSamplers(1, &device->null_sampler)); GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); @@ -800,7 +818,6 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 } else { - device->default_sampler = 0; device->null_sampler = 0; } } @@ -810,14 +827,15 @@ static void destroy_default_samplers(struct wined3d_device *device, struct wined { const struct wined3d_gl_info *gl_info = context->gl_info; + wined3d_sampler_decref(device->default_sampler); + device->default_sampler = NULL; + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { - GL_EXTCALL(glDeleteSamplers(1, &device->default_sampler)); GL_EXTCALL(glDeleteSamplers(1, &device->null_sampler)); checkGLcall("glDeleteSamplers"); } - device->default_sampler = 0; device->null_sampler = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64e669b..6b683aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2688,7 +2688,7 @@ struct wined3d_device } dummy_textures; /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ - GLuint default_sampler; + struct wined3d_sampler *default_sampler; GLuint null_sampler; /* Command stream */

1 0

Józef Kucia : wined3d: Create wined3d sampler for NULL sampler.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: f82a437a90280b8682dd22169cb335a1dc4c6fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82a437a90280b8682dd22169… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:05 2017 +0100 wined3d: Create wined3d sampler for NULL sampler. 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/context.c | 2 +- dlls/wined3d/device.c | 35 ++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b554b00..baba979 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3433,7 +3433,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) sampler_name = sampler->name; else - sampler_name = device->null_sampler; + sampler_name = device->null_sampler->name; context_active_texture(context, gl_info, bind_idx); GL_EXTCALL(glBindSampler(bind_idx, sampler_name)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba30d20..a34cb97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -775,7 +775,6 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d /* Context activation is done by the caller. */ static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_sampler_desc desc; HRESULT hr; @@ -806,37 +805,27 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 device->default_sampler = NULL; } - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + /* In D3D10+, a NULL sampler maps to the default sampler state. */ + desc.address_u = WINED3D_TADDRESS_CLAMP; + desc.address_v = WINED3D_TADDRESS_CLAMP; + desc.address_w = WINED3D_TADDRESS_CLAMP; + desc.mag_filter = WINED3D_TEXF_LINEAR; + desc.min_filter = WINED3D_TEXF_LINEAR; + desc.mip_filter = WINED3D_TEXF_LINEAR; + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->null_sampler))) { - /* In D3D10+, a NULL sampler maps to the default sampler state. */ - GL_EXTCALL(glGenSamplers(1, &device->null_sampler)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); - GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE)); - checkGLcall("Create null sampler"); - } - else - { - device->null_sampler = 0; + ERR("Failed to create null sampler, hr %#x.n", hr); + device->null_sampler = NULL; } } /* Context activation is done by the caller. */ static void destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; - wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; - - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) - { - GL_EXTCALL(glDeleteSamplers(1, &device->null_sampler)); - checkGLcall("glDeleteSamplers"); - } - - device->null_sampler = 0; + wined3d_sampler_decref(device->null_sampler); + device->null_sampler = NULL; } static LONG fullscreen_style(LONG style) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6b683aa..3b342d8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2689,7 +2689,7 @@ struct wined3d_device /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ struct wined3d_sampler *default_sampler; - GLuint null_sampler; + struct wined3d_sampler *null_sampler; /* Command stream */ struct wined3d_cs *cs;

1 0

Józef Kucia : wined3d: Introduce wined3d_sampler_bind () helper function.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 584ec259b25bdde4b5ae0bb52cab438fbe76c84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=584ec259b25bdde4b5ae0bb52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:06 2017 +0100 wined3d: Introduce wined3d_sampler_bind() helper function. 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/context.c | 16 ++++------------ dlls/wined3d/sampler.c | 21 +++++++++++++++++++++ dlls/wined3d/view.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 7 +++++-- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index baba979..c1803a4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3394,14 +3394,12 @@ static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { unsigned int bind_idx, shader_sampler_count, base, count, i; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; struct wined3d_sampler *sampler; const DWORD *tex_unit_map; - GLuint sampler_name; if (!(shader = state->shader[shader_type])) return; @@ -3429,16 +3427,10 @@ static void context_bind_shader_resources(struct wined3d_context *context, } if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler_name = device->default_sampler->name; - else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) - sampler_name = sampler->name; - else - sampler_name = device->null_sampler->name; - - context_active_texture(context, gl_info, bind_idx); - GL_EXTCALL(glBindSampler(bind_idx, sampler_name)); - checkGLcall("glBindSampler"); - wined3d_shader_resource_view_bind(view, context); + sampler = device->default_sampler; + else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) + sampler = device->null_sampler; + wined3d_shader_resource_view_bind(view, bind_idx, sampler, context); } } diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index a987a35..c1364c2 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -150,3 +150,24 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct return WINED3D_OK; } + +/* This function relies on the correct texture being bound and loaded. */ +void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, + struct wined3d_texture *texture, const struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + GL_EXTCALL(glBindSampler(unit, sampler->name)); + checkGLcall("bind sampler"); + } + else if (texture) + { + wined3d_texture_apply_sampler_desc(texture, &sampler->desc, context); + } + else + { + ERR("Could not apply sampler state.\n"); + } +} diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ff31de2..ac558a4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -638,13 +638,17 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc } void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, - struct wined3d_context *context) + unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture; + context_active_texture(context, gl_info, unit); + if (view->gl_view.name) { context_bind_texture(context, view->gl_view.target, view->gl_view.name); + wined3d_sampler_bind(sampler, unit, NULL, context); return; } @@ -656,6 +660,7 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view texture = wined3d_texture_from_resource(view->resource); wined3d_texture_bind(texture, context, FALSE); + wined3d_sampler_bind(sampler, unit, texture, context); } ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b342d8..21c5f1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3087,6 +3087,9 @@ struct wined3d_sampler GLuint name; }; +void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, + struct wined3d_texture *texture, const struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_vertex_declaration_element { const struct wined3d_format *format; @@ -3415,8 +3418,8 @@ struct wined3d_shader_resource_view struct wined3d_gl_view gl_view; }; -void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, unsigned int unit, + struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view {

1 0