wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Nikolay Sivov : dwrite/tests: Fix analyzer test failures on Win10.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 4c12157c345ac6a77991e4fef332f6da3dbc0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c12157c345ac6a77991e4fef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 20:33:58 2015 +0300 dwrite/tests: Fix analyzer test failures on Win10. --- dlls/dwrite/tests/analyzer.c | 50 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 402787f..cee9934 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1197,6 +1197,35 @@ static void test_numbersubstitution(void) IDWriteNumberSubstitution_Release(substitution); } +static void get_fontface_glyphs(IDWriteFontFace *fontface, const WCHAR *str, UINT16 *glyphs) +{ + while (*str) { + UINT32 codepoint = *str; + HRESULT hr; + + hr = IDWriteFontFace_GetGlyphIndices(fontface, &codepoint, 1, glyphs++); + ok(hr == S_OK, "got 0x%08x\n", hr); + str++; + } +} + +static void get_fontface_advances(IDWriteFontFace *fontface, FLOAT emsize, const UINT16 *glyphs, FLOAT *advances, UINT32 count) +{ + DWRITE_FONT_METRICS fontmetrics; + UINT32 i; + + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + for (i = 0; i < count; i++) { + DWRITE_GLYPH_METRICS metrics; + HRESULT hr; + + hr = IDWriteFontFace_GetDesignGlyphMetrics(fontface, glyphs + i, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + advances[i] = (FLOAT)metrics.advanceWidth * emsize / (FLOAT)fontmetrics.designUnitsPerEm; + } +} + static void test_GetGlyphs(void) { static const WCHAR test1W[] = {'<','B',' ','C',0}; @@ -1205,6 +1234,7 @@ static void test_GetGlyphs(void) DWRITE_SHAPING_GLYPH_PROPERTIES shapingprops[20]; DWRITE_SHAPING_TEXT_PROPERTIES props[20]; UINT32 maxglyphcount, actual_count; + FLOAT advances[10], advances2[10]; IDWriteTextAnalyzer *analyzer; IDWriteFontFace *fontface; DWRITE_SCRIPT_ANALYSIS sa; @@ -1212,7 +1242,6 @@ static void test_GetGlyphs(void) UINT16 clustermap[10]; UINT16 glyphs1[10]; UINT16 glyphs2[10]; - FLOAT advances[10]; HRESULT hr; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); @@ -1275,13 +1304,16 @@ if (0) { ok(glyphs1[0] != glyphs2[0], "got %d\n", glyphs1[0]); /* embedded control codes, with unknown script id 0 */ + get_fontface_glyphs(fontface, test3W, glyphs2); + get_fontface_advances(fontface, 10.0, glyphs2, advances2, 2); + actual_count = 0; hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test3W, lstrlenW(test3W), fontface, FALSE, TRUE, &sa, NULL, NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(actual_count == 2, "got %d\n", actual_count); - ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); - ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(glyphs1[0] == glyphs2[0], "got %u, expected %u\n", glyphs1[0], glyphs2[0]); + ok(glyphs1[1] == glyphs2[1], "got %u, expected %u\n", glyphs1[1], glyphs2[1]); ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); @@ -1294,8 +1326,8 @@ if (0) { glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, advances, offsets); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(advances[0] == 10.0, "got %.2f\n", advances[0]); - ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + ok(advances[0] == advances2[0], "got %.2f, expected %.2f\n", advances[0], advances2[0]); + ok(advances[1] == advances2[1], "got %.2f, expected %.2f\n", advances[1], advances2[1]); /* embedded control codes with proper script */ sa.script = 0; @@ -1306,8 +1338,8 @@ if (0) { NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(actual_count == 2, "got %d\n", actual_count); - ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); - ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(glyphs1[0] == glyphs2[0], "got %u, expected %u\n", glyphs1[0], glyphs2[0]); + ok(glyphs1[1] == glyphs2[1], "got %u, expected %u\n", glyphs1[1], glyphs2[1]); ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); @@ -1320,8 +1352,8 @@ if (0) { glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, advances, offsets); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(advances[0] == 10.0, "got %.2f\n", advances[0]); - ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + ok(advances[0] == advances2[0], "got %.2f, expected %.2f\n", advances[0], advances2[0]); + ok(advances[1] == advances2[1], "got %.2f, expected %.2f\n", advances[1], advances2[1]); IDWriteTextAnalyzer_Release(analyzer); IDWriteFontFace_Release(fontface);

1 0

Nikolay Sivov : dwrite/tests: Fix layout test failure on Win10.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 8dd0738b1ca3fb8f75301edde9d8c078f810cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd0738b1ca3fb8f75301edde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 20:33:29 2015 +0300 dwrite/tests: Fix layout test failure on Win10. --- dlls/dwrite/tests/layout.c | 2 +- include/dwrite.idl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9e2aaea..67d49d1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -975,7 +975,7 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, -10.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_UNIFORM+1, 0.0, 0.0); + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_PROPORTIONAL+1, 0.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); diff --git a/include/dwrite.idl b/include/dwrite.idl index bb41b4f..f8644ba 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -219,7 +219,8 @@ typedef enum DWRITE_BREAK_CONDITION typedef enum DWRITE_LINE_SPACING_METHOD { DWRITE_LINE_SPACING_METHOD_DEFAULT, - DWRITE_LINE_SPACING_METHOD_UNIFORM + DWRITE_LINE_SPACING_METHOD_UNIFORM, + DWRITE_LINE_SPACING_METHOD_PROPORTIONAL } DWRITE_LINE_SPACING_METHOD; cpp_quote("#define DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) ( \\")

1 0

Alistair Leslie-Hughes : include: Add more WELL_KNOWN_SID_TYPE values.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 0174a6fc1de85d18119f458ea977d39adf0158e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0174a6fc1de85d18119f458ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 19 13:08:09 2015 +1000 include: Add more WELL_KNOWN_SID_TYPE values. --- include/winnt.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index a1116bd..93e216f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4301,6 +4301,31 @@ typedef enum { WinLocalLogonSid = 80, WinConsoleLogonSid = 81, WinThisOrganizationCertificateSid = 82, + WinApplicationPackageAuthoritySid = 83, + WinBuiltinAnyPackageSid = 84, + WinCapabilityInternetClientSid = 85, + WinCapabilityInternetClientServerSid = 86, + WinCapabilityPrivateNetworkClientServerSid = 87, + WinCapabilityPicturesLibrarySid = 88, + WinCapabilityVideosLibrarySid = 89, + WinCapabilityMusicLibrarySid = 90, + WinCapabilityDocumentsLibrarySid = 91, + WinCapabilitySharedUserCertificatesSid = 92, + WinCapabilityEnterpriseAuthenticationSid = 93, + WinCapabilityRemovableStorageSid = 94, + WinBuiltinRDSRemoteAccessServersSid = 95, + WinBuiltinRDSEndpointServersSid = 96, + WinBuiltinRDSManagementServersSid = 97, + WinUserModeDriversSid = 98, + WinBuiltinHyperVAdminsSid = 99, + WinAccountCloneableControllersSid = 100, + WinBuiltinAccessControlAssistanceOperatorsSid = 101, + WinBuiltinRemoteManagementUsersSid = 102, + WinAuthenticationAuthorityAssertedSid = 103, + WinAuthenticationServiceAssertedSid = 104, + WinLocalAccountSid = 105, + WinLocalAccountAndAdministratorSid = 106, + WinAccountProtectedUsersSid = 107, } WELL_KNOWN_SID_TYPE; /*

1 0

Huw Davies : gdi32/tests: 64-bit GetFontFileInfo may fail with error ERROR_NOACCESS.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 5021e91940fe01a54e6ee91f9d9f246ce8f6dd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5021e91940fe01a54e6ee91f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 20 10:50:24 2015 +0100 gdi32/tests: 64-bit GetFontFileInfo may fail with error ERROR_NOACCESS. --- dlls/gdi32/tests/font.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 68ade9a..65685ac 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4116,7 +4116,7 @@ static void test_RealizationInfo(void) { HDC hdc; DWORD info[4], info2[10]; - BOOL r; + BOOL r, have_file = FALSE; HFONT hfont, hfont_old; LOGFONTA lf; DWORD needed, read; @@ -4199,25 +4199,30 @@ static void test_RealizationInfo(void) /* Test GetFontFileInfo() */ r = pGetFontFileInfo(info2[3], 0, &file_info, sizeof(file_info), &needed); - ok(r != 0, "ret 0 gle %d\n", GetLastError()); - - h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); + ok(r != 0 || GetLastError() == ERROR_NOACCESS, "ret %d gle %d\n", r, GetLastError()); - GetFileTime(h, NULL, NULL, &time); - ok(!CompareFileTime(&file_info.time, &time), "time mismatch\n"); - GetFileSizeEx(h, &size); - ok(file_info.size.QuadPart == size.QuadPart, "size mismatch\n"); - - /* Read first 16 bytes from the file */ - ReadFile(h, file, sizeof(file), &read, NULL); - CloseHandle(h); + if (r) + { + h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); + + GetFileTime(h, NULL, NULL, &time); + ok(!CompareFileTime(&file_info.time, &time), "time mismatch\n"); + GetFileSizeEx(h, &size); + ok(file_info.size.QuadPart == size.QuadPart, "size mismatch\n"); + + /* Read first 16 bytes from the file */ + ReadFile(h, file, sizeof(file), &read, NULL); + CloseHandle(h); + have_file = TRUE; + } /* Get bytes 2 - 16 using GetFontFileData */ r = pGetFontFileData(info2[3], 0, 2, data, sizeof(data)); ok(r != 0, "ret 0 gle %d\n", GetLastError()); - ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); + if (have_file) + ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); } DeleteObject(SelectObject(hdc, hfont_old));

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateTransformedGeometry().
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: acbb0bdfacd8f322df3d4c316b826f809125fb14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbb0bdfacd8f322df3d4c316… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 20 11:42:04 2015 +0200 d2d1: Implement d2d_factory_CreateTransformedGeometry(). --- dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/factory.c | 14 ++- dlls/d2d1/geometry.c | 261 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/render_target.c | 39 +++++-- dlls/d2d1/tests/d2d1.c | 144 ++++++++++++++++++++----- 5 files changed, 426 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acbb0bdfacd8f322df3d4…

1 0

Henri Verbeet : d2d1: Properly cleanup in d2d_rectangle_geometry_init() failure paths.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 69906b59d860b2f1efaa0760392c530c8d505bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=69906b59d860b2f1efaa07603… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 20 11:42:03 2015 +0200 d2d1: Properly cleanup in d2d_rectangle_geometry_init() failure paths. This avoids leaking the factory reference in particular. --- dlls/d2d1/geometry.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 79764e1..f75700c 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -977,13 +977,12 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) return TRUE; } -static void d2d_geometry_destroy(struct d2d_geometry *geometry) +static void d2d_geometry_cleanup(struct d2d_geometry *geometry) { HeapFree(GetProcessHeap(), 0, geometry->beziers); HeapFree(GetProcessHeap(), 0, geometry->faces); HeapFree(GetProcessHeap(), 0, geometry->vertices); ID2D1Factory_Release(geometry->factory); - HeapFree(GetProcessHeap(), 0, geometry); } static void d2d_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, @@ -1363,7 +1362,8 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac if (!refcount) { d2d_path_geometry_free_figures(geometry); - d2d_geometry_destroy(geometry); + d2d_geometry_cleanup(geometry); + HeapFree(GetProcessHeap(), 0, geometry); } return refcount; @@ -1622,7 +1622,10 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - d2d_geometry_destroy(geometry); + { + d2d_geometry_cleanup(geometry); + HeapFree(GetProcessHeap(), 0, geometry); + } return refcount; } @@ -1792,11 +1795,14 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory geometry->u.rectangle.rect = *rect; if (!(geometry->vertices = HeapAlloc(GetProcessHeap(), 0, 4 * sizeof(*geometry->vertices)))) + { + d2d_geometry_cleanup(geometry); return E_OUTOFMEMORY; + } geometry->vertex_count = 4; if (!d2d_array_reserve((void **)&geometry->faces, &geometry->faces_size, 2, sizeof(*geometry->faces))) { - HeapFree(GetProcessHeap(), 0, geometry->vertices); + d2d_geometry_cleanup(geometry); return E_OUTOFMEMORY; } geometry->face_count = 2;

1 0

Alistair Leslie-Hughes : include/d3dcommon.idl: Add missing typedefs.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 5eaf2b5179ba5d95ebc4ffd66834a96dfe07d21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eaf2b5179ba5d95ebc4ffd66… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 26 11:21:53 2015 +1000 include/d3dcommon.idl: Add missing typedefs. --- include/d3dcommon.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index f8fe203..c7e3b4d 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -126,6 +126,19 @@ typedef enum _D3D_SHADER_VARIABLE_CLASS D3D_SVC_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_CLASS; +typedef enum _D3D_SHADER_VARIABLE_FLAGS +{ + D3D_SVF_USERPACKED = 0x01, + D3D_SVF_USED = 0x02, + D3D_SVF_INTERFACE_POINTER = 0x04, + D3D_SVF_INTERFACE_PARAMETER = 0x08, + D3D10_SVF_USERPACKED = D3D_SVF_USERPACKED, + D3D10_SVF_USED = D3D_SVF_USED, + D3D11_SVF_INTERFACE_POINTER = D3D_SVF_INTERFACE_POINTER, + D3D11_SVF_INTERFACE_PARAMETER = D3D_SVF_INTERFACE_PARAMETER, + D3D_SVF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_VARIABLE_FLAGS; + typedef enum _D3D_SHADER_VARIABLE_TYPE { D3D_SVT_VOID, @@ -235,6 +248,22 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE; +typedef enum _D3D_SHADER_INPUT_FLAGS +{ + D3D_SIF_USERPACKED = 0x01, + D3D_SIF_COMPARISON_SAMPLER = 0x02, + D3D_SIF_TEXTURE_COMPONENT_0 = 0x04, + D3D_SIF_TEXTURE_COMPONENT_1 = 0x08, + D3D_SIF_TEXTURE_COMPONENTS = 0x0C, + D3D_SIF_UNUSED = 0x10, + D3D10_SIF_USERPACKED = D3D_SIF_USERPACKED, + D3D10_SIF_COMPARISON_SAMPLER = D3D_SIF_COMPARISON_SAMPLER, + D3D10_SIF_TEXTURE_COMPONENT_0 = D3D_SIF_TEXTURE_COMPONENT_0, + D3D10_SIF_TEXTURE_COMPONENT_1 = D3D_SIF_TEXTURE_COMPONENT_1, + D3D10_SIF_TEXTURE_COMPONENTS = D3D_SIF_TEXTURE_COMPONENTS, + D3D_SIF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_INPUT_FLAGS; + typedef enum D3D_PRIMITIVE { D3D_PRIMITIVE_UNDEFINED, @@ -636,4 +665,11 @@ typedef enum _D3D_SHADER_INPUT_TYPE D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, } D3D_SHADER_INPUT_TYPE; +typedef enum _D3D_SHADER_CBUFFER_FLAGS +{ + D3D_CBF_USERPACKED = 0x01, + D3D10_CBF_USERPACKED = D3D_CBF_USERPACKED, + D3D_CBF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_CBUFFER_FLAGS; + cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);")

1 0

Zhenbo Li : mshtml: Add IHTMLXMLHttpRequest::abort() method implementation.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: b8f8b95e20b22fd57b7ef54263f3175bdca50187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f8b95e20b22fd57b7ef5426… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 19 09:33:41 2015 +0800 mshtml: Add IHTMLXMLHttpRequest::abort() method implementation. --- dlls/mshtml/tests/xmlhttprequest.c | 130 +++++++++++++++++++++++++++++++------ dlls/mshtml/xmlhttprequest.c | 13 +++- 2 files changed, 122 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8f8b95e20b22fd57b7ef…

1 0

Stefan Dösinger : wined3d: Use GL_RGB565 if available.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 3bd0eb3eab26299f5af18a94d98ea131949e68e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd0eb3eab26299f5af18a94d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 20 10:03:33 2015 +0200 wined3d: Use GL_RGB565 if available. This offers better precision on r300g and r600g than GL_RGB5. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/utils.c | 5 +++++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8e4448d..3f52300 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -116,6 +116,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, + {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -2483,6 +2484,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_draw_instanced */ USE_GL_FUNC(glDrawArraysInstancedARB) USE_GL_FUNC(glDrawElementsInstancedARB) + /* GL_ARB_ES2_compatibility */ + USE_GL_FUNC(glReleaseShaderCompiler) + USE_GL_FUNC(glShaderBinary) + USE_GL_FUNC(glGetShaderPrecisionFormat) + USE_GL_FUNC(glDepthRangef) + USE_GL_FUNC(glClearDepthf) /* GL_ARB_framebuffer_object */ USE_GL_FUNC(glBindFramebuffer) USE_GL_FUNC(glBindRenderbuffer) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0d4e878..ee4ccfd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1019,6 +1019,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_RGB565, GL_RGB8, + GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8c07ed1..2be7262 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -52,6 +52,7 @@ enum wined3d_gl_extension ARB_DRAW_BUFFERS, ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED, + ARB_ES2_COMPATIBILITY, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0

Stefan Dösinger : wined3d: Use the correct color key in ARBfp color key blits.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 6626b1a51b78bac189e184162db7102c2bd12e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6626b1a51b78bac189e184162… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 20 10:03:32 2015 +0200 wined3d: Use the correct color key in ARBfp color key blits. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2c69c02..378900e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7724,7 +7724,7 @@ err_out: if (type.use_color_key) { wined3d_format_convert_color_to_float(surface->resource.format, NULL, - surface->container->async.src_blt_color_key.color_space_high_value, &float_color_key); + color_key->color_space_high_value, &float_color_key); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_COLOR_KEY, &float_color_key.r)); checkGLcall("glProgramLocalParameter4fvARB");

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015