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

Matteo Bruni : wined3d: Don' t unnecessarily fallback to immediate mode for FFP draws with the PSIZE attribute.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: a064797e0f0f789a03decb6205f49b5de9b16065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a064797e0f0f789a03decb620… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 28 23:14:37 2015 +0200 wined3d: Don't unnecessarily fallback to immediate mode for FFP draws with the PSIZE attribute. --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2fef379..32813e9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2983,7 +2983,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st } else { - WORD slow_mask = (1 << WINED3D_FFP_PSIZE); + WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1 << WINED3D_FFP_PSIZE); slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR));

1 0

Matteo Bruni : wined3d: Update GLSL vertex pipe replacement TODO comment.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 1eb6e5dd80b1854ae86d33853873546ddb1f7705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb6e5dd80b1854ae86d33853… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 28 23:14:39 2015 +0200 wined3d: Update GLSL vertex pipe replacement TODO comment. It turns out most of that has been implemented since the comment was originally written. --- dlls/wined3d/glsl_shader.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9880df1..7bcf102 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8111,19 +8111,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = }; /* TODO: - * - This currently depends on GL fixed function functions to set things - * like light parameters. Ideally we'd use regular uniforms for that. - * - In part because of the previous point, much of this is modelled after - * GL fixed function, and has much of the same limitations. For example, - * D3D spot lights are slightly different from GL spot lights. - * - We can now implement drawing transformed vertices using the GLSL pipe, - * instead of using the immediate mode fallback. - * - Similarly, we don't need the fallback for certain combinations of - * material sources anymore. - * - Implement vertex tweening. - * - Handle WINED3D_TSS_TEXCOORD_INDEX in the shader, instead of duplicating - * attribute arrays in load_tex_coords(). - * - Per-vertex point sizes. */ + * - Implement vertex tweening. */ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe = { glsl_vertex_pipe_vp_enable,

1 0

Huw Davies : qcap/tests: Fix test failures on Win64.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 876d1d9eb85b25b4827df7c52bcfe8e208e1495d URL: http://source.winehq.org/git/wine.git/?a=commit;h=876d1d9eb85b25b4827df7c52… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 29 08:27:57 2015 +0100 qcap/tests: Fix test failures on Win64. --- dlls/qcap/tests/qcap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 7fd48ef..32f88e3 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1907,6 +1907,11 @@ static void test_COM_vfwcapture(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_VfwCapture, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_VfwCapture not registered\n"); + return; + } ok(hr == S_OK, "VfwCapture create failed: %08x\n", hr); hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_IBaseFilter, (void**)&bf); ok(hr == S_OK, "QueryInterface for IID_IBaseFilter failed: %08x\n", hr);

1 0

Nikolay Sivov : dwrite: Store run info for IDWriteGlyphRunAnalysis instance.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: fb35557db96c97b6a13ed73a8da6bafac364285e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb35557db96c97b6a13ed73a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 29 11:57:52 2015 +0300 dwrite: Store run info for IDWriteGlyphRunAnalysis instance. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 35 ++++++++++++++++++++++++++++++++++- dlls/dwrite/main.c | 8 ++++---- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 65cf4b0..aa24550 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -124,7 +124,7 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_GLYPH_RUN const*,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4fdea6c..9876451 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -111,6 +111,10 @@ struct dwrite_glyphrunanalysis { LONG ref; DWRITE_RENDERING_MODE rendering_mode; + DWRITE_GLYPH_RUN run; + UINT16 *glyphs; + FLOAT *advances; + DWRITE_GLYPH_OFFSET *offsets; }; #define GLYPH_BLOCK_SHIFT 8 @@ -2890,6 +2894,10 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) TRACE("(%p)->(%u)\n", This, ref); if (!ref) { + IDWriteFontFace_Release(This->run.fontFace); + heap_free(This->glyphs); + heap_free(This->advances); + heap_free(This->offsets); heap_free(This); } @@ -2941,7 +2949,7 @@ static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { glyphrunanalysis_GetAlphaBlendParams }; -HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, IDWriteGlyphRunAnalysis **ret) +HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_GLYPH_RUN const *run, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; @@ -2958,6 +2966,31 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, IDWriteGly analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl; analysis->ref = 1; analysis->rendering_mode = rendering_mode; + analysis->run = *run; + IDWriteFontFace_AddRef(analysis->run.fontFace); + analysis->glyphs = heap_alloc(run->glyphCount*sizeof(*run->glyphIndices)); + analysis->advances = heap_alloc(run->glyphCount*sizeof(*run->glyphAdvances)); + analysis->offsets = heap_alloc(run->glyphCount*sizeof(*run->glyphOffsets)); + if (!analysis->glyphs || !analysis->advances || !analysis->offsets) { + heap_free(analysis->glyphs); + heap_free(analysis->advances); + heap_free(analysis->offsets); + + analysis->glyphs = NULL; + analysis->advances = NULL; + analysis->offsets = NULL; + + IDWriteGlyphRunAnalysis_Release(&analysis->IDWriteGlyphRunAnalysis_iface); + return E_OUTOFMEMORY; + } + + analysis->run.glyphIndices = analysis->glyphs; + analysis->run.glyphAdvances = analysis->advances; + analysis->run.glyphOffsets = analysis->offsets; + + memcpy(analysis->glyphs, run->glyphIndices, run->glyphCount*sizeof(*run->glyphIndices)); + memcpy(analysis->advances, run->glyphAdvances, run->glyphCount*sizeof(*run->glyphAdvances)); + memcpy(analysis->offsets, run->glyphOffsets, run->glyphCount*sizeof(*run->glyphOffsets)); *ret = &analysis->IDWriteGlyphRunAnalysis_iface; return S_OK; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 96b4925..7c027f9 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1070,16 +1070,16 @@ static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory2 *if return create_numbersubstitution(method, locale, ignore_user_override, substitution); } -static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *iface, DWRITE_GLYPH_RUN const *glyph_run, - FLOAT pixels_per_dip, DWRITE_MATRIX const* transform, DWRITE_RENDERING_MODE rendering_mode, +static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *iface, DWRITE_GLYPH_RUN const *run, + FLOAT ppdip, DWRITE_MATRIX const* transform, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, FLOAT baseline_x, FLOAT baseline_y, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - TRACE("(%p)->(%p %f %p %d %d %f %f %p)\n", This, glyph_run, pixels_per_dip, transform, rendering_mode, + TRACE("(%p)->(%p %f %p %d %d %f %f %p)\n", This, run, ppdip, transform, rendering_mode, measuring_mode, baseline_x, baseline_y, analysis); - return create_glyphrunanalysis(rendering_mode, analysis); + return create_glyphrunanalysis(rendering_mode, run, analysis); } static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *iface, IDWriteFontCollection **collection,

1 0

Nikolay Sivov : dwrite: Implement GetAlphaBlendParams().
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 2c6eca8682bd216c7579796aa96fd68f98dafcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6eca8682bd216c7579796aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 29 11:58:24 2015 +0300 dwrite: Implement GetAlphaBlendParams(). --- dlls/dwrite/font.c | 34 +++++++++++++-- dlls/dwrite/tests/font.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9876451..3f016d6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2933,11 +2933,39 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi } static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalysis *iface, IDWriteRenderingParams *params, - FLOAT *blendGamma, FLOAT *blendEnhancedContrast, FLOAT *blendClearTypeLevel) + FLOAT *gamma, FLOAT *contrast, FLOAT *cleartypelevel) { struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); - FIXME("(%p)->(%p %p %p %p): stub\n", This, params, blendGamma, blendEnhancedContrast, blendClearTypeLevel); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p %p)\n", This, params, gamma, contrast, cleartypelevel); + + if (!params) + return E_INVALIDARG; + + switch (This->rendering_mode) + { + case DWRITE_RENDERING_MODE_GDI_CLASSIC: + case DWRITE_RENDERING_MODE_GDI_NATURAL: + { + UINT value = 0; + SystemParametersInfoW(SPI_GETFONTSMOOTHINGCONTRAST, 0, &value, 0); + *gamma = (FLOAT)value / 1000.0f; + *contrast = 0.0f; + *cleartypelevel = 1.0f; + break; + } + case DWRITE_RENDERING_MODE_ALIASED: + case DWRITE_RENDERING_MODE_NATURAL: + case DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC: + *gamma = IDWriteRenderingParams_GetGamma(params); + *contrast = IDWriteRenderingParams_GetEnhancedContrast(params); + *cleartypelevel = IDWriteRenderingParams_GetClearTypeLevel(params); + break; + default: + ; + } + + return S_OK; } static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index bd001e7..502930f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -20,6 +20,7 @@ */ #include <math.h> +#include <limits.h> #define COBJMACROS @@ -4346,6 +4347,114 @@ if (0) /* crashes on native */ IDWriteFactory_Release(factory); } +static inline BOOL float_eq(FLOAT left, FLOAT right) +{ + int x = *(int *)&left; + int y = *(int *)&right; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + return abs(x - y) <= 8; +} + +static void test_GetAlphaBlendParams(void) +{ + static const DWRITE_RENDERING_MODE rendermodes[] = { + DWRITE_RENDERING_MODE_ALIASED, + DWRITE_RENDERING_MODE_GDI_CLASSIC, + DWRITE_RENDERING_MODE_GDI_NATURAL, + DWRITE_RENDERING_MODE_NATURAL, + DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, + }; + + IDWriteGlyphRunAnalysis *analysis; + FLOAT gamma, contrast, ctlevel; + IDWriteRenderingParams *params; + DWRITE_GLYPH_METRICS metrics; + DWRITE_GLYPH_OFFSET offset; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; + FLOAT advance, expected_gdi_gamma; + UINT value = 0; + UINT16 glyph; + UINT32 ch, i; + HRESULT hr; + BOOL ret; + + factory = create_factory(); + fontface = create_fontface(factory); + + ch = 'A'; + glyph = 0; + hr = IDWriteFontFace_GetGlyphIndices(fontface, &ch, 1, &glyph); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyph > 0, "got %u\n", glyph); + + hr = IDWriteFontFace_GetDesignGlyphMetrics(fontface, &glyph, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + advance = metrics.advanceWidth; + + offset.advanceOffset = 0.0; + offset.ascenderOffset = 0.0; + + run.fontFace = fontface; + run.fontEmSize = 24.0; + run.glyphCount = 1; + run.glyphIndices = &glyph; + run.glyphAdvances = &advance; + run.glyphOffsets = &offset; + run.isSideways = FALSE; + run.bidiLevel = 0; + + hr = IDWriteFactory_CreateCustomRenderingParams(factory, 0.9, 0.3, 0.1, DWRITE_PIXEL_GEOMETRY_RGB, + DWRITE_RENDERING_MODE_DEFAULT, &params); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = 0; + ret = SystemParametersInfoW(SPI_GETFONTSMOOTHINGCONTRAST, 0, &value, 0); + ok(ret, "got %d\n", ret); + expected_gdi_gamma = (FLOAT)(value / 1000.0); + + for (i = 0; i < sizeof(rendermodes)/sizeof(rendermodes[0]); i++) { + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + rendermodes[i], DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + + gamma = contrast = ctlevel = -1.0; + hr = IDWriteGlyphRunAnalysis_GetAlphaBlendParams(analysis, NULL, &gamma, &contrast, &ctlevel); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(gamma == -1.0, "got %.2f\n", gamma); + ok(contrast == -1.0, "got %.2f\n", contrast); + ok(ctlevel == -1.0, "got %.2f\n", ctlevel); + + gamma = contrast = ctlevel = -1.0; + hr = IDWriteGlyphRunAnalysis_GetAlphaBlendParams(analysis, params, &gamma, &contrast, &ctlevel); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (rendermodes[i] == DWRITE_RENDERING_MODE_GDI_CLASSIC || rendermodes[i] == DWRITE_RENDERING_MODE_GDI_NATURAL) { + ok(float_eq(gamma, expected_gdi_gamma), "got %.2f, expected %.2f\n", gamma, expected_gdi_gamma); + ok(contrast == 0.0f, "got %.2f\n", contrast); + ok(ctlevel == 1.0f, "got %.2f\n", ctlevel); + } + else { + ok(gamma == 0.9f, "got %.2f\n", gamma); + ok(contrast == 0.3f, "got %.2f\n", contrast); + ok(ctlevel == 0.1f, "got %.2f\n", ctlevel); + } + + IDWriteGlyphRunAnalysis_Release(analysis); + } + + IDWriteRenderingParams_Release(params); + IDWriteFontFace_Release(fontface); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4393,6 +4502,7 @@ START_TEST(font) test_GetPanose(); test_GetGdiCompatibleGlyphAdvances(); test_GetRecommendedRenderingMode(); + test_GetAlphaBlendParams(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement GetAlphaTextureBounds().
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: b50416aa5fd10911856cfff241a7013b7fbaf944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50416aa5fd10911856cfff24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 29 11:59:02 2015 +0300 dwrite: Implement GetAlphaTextureBounds(). --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 62 +++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/freetype.c | 40 ++++++++++++++++++++++++++-- dlls/dwrite/main.c | 4 +-- dlls/dwrite/tests/font.c | 12 +++------ 5 files changed, 103 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b50416aa5fd10911856cf…

1 0

Nikolay Sivov : dwrite: Implement parameter validation for CreateAlphaTexture().
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 5137aaa9c9b372ee6b5380eaf4a85d6bf500d0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5137aaa9c9b372ee6b5380eaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 29 12:00:26 2015 +0300 dwrite: Implement parameter validation for CreateAlphaTexture(). --- dlls/dwrite/font.c | 109 +++++++++++++++++++++++++----------- dlls/dwrite/tests/font.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5137aaa9c9b372ee6b538…

1 0

Henri Verbeet : d2d1: Validate bitmap formats.
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: 1b3574ebc0adb2fb05413fe6ed11607455a7aabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3574ebc0adb2fb05413fe6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 29 11:36:18 2015 +0200 d2d1: Validate bitmap formats. --- dlls/d2d1/bitmap.c | 40 +++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index ccc8d75..2439d79 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -165,8 +165,48 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; + BOOL supported = FALSE; + unsigned int i; HRESULT hr; + static const D2D1_PIXEL_FORMAT supported_formats[] = + { + {DXGI_FORMAT_R32G32B32A32_FLOAT, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R16G16B16A16_FLOAT, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R16G16B16A16_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R16G16B16A16_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT }, + {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_B8G8R8X8_UNORM, D2D1_ALPHA_MODE_IGNORE }, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D2D1_ALPHA_MODE_PREMULTIPLIED}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D2D1_ALPHA_MODE_IGNORE }, + }; + + for (i = 0; i < sizeof(supported_formats) / sizeof(*supported_formats); ++i) + { + if (supported_formats[i].format == desc->pixelFormat.format + && supported_formats[i].alphaMode == desc->pixelFormat.alphaMode) + { + supported = TRUE; + break; + } + } + + if (!supported) + { + WARN("Tried to create bitmap with unsupported format {%#x / %#x}.\n", + desc->pixelFormat.format, desc->pixelFormat.alphaMode); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + FIXME("Ignoring bitmap properties.\n"); bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f8ebecc..4d83154 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1530,6 +1530,85 @@ static void test_path_geometry(void) DestroyWindow(window); } +static void test_bitmap_formats(void) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + IDXGISwapChain *swapchain; + D2D1_SIZE_U size = {4, 4}; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Bitmap *bitmap; + unsigned int i, j; + HWND window; + HRESULT hr; + + static const struct + { + DXGI_FORMAT format; + DWORD mask; + } + bitmap_formats[] = + { + {DXGI_FORMAT_R32G32B32A32_FLOAT, 0x8a}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, 0x8a}, + {DXGI_FORMAT_R16G16B16A16_UNORM, 0x8a}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, 0x00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 0x0a}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 0x8a}, + {DXGI_FORMAT_R8G8B8A8_UINT, 0x00}, + {DXGI_FORMAT_R8G8B8A8_SNORM, 0x00}, + {DXGI_FORMAT_R8G8B8A8_SINT, 0x00}, + {DXGI_FORMAT_A8_UNORM, 0x06}, + {DXGI_FORMAT_B8G8R8A8_UNORM, 0x0a}, + {DXGI_FORMAT_B8G8R8X8_UNORM, 0x88}, + {DXGI_FORMAT_B8G8R8A8_TYPELESS, 0x00}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, 0x8a}, + }; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_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_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + for (i = 0; i < sizeof(bitmap_formats) / sizeof(*bitmap_formats); ++i) + { + for (j = 0; j < 4; ++j) + { + if ((bitmap_formats[i].mask & (0x80 | (1u << j))) == (0x80 | (1u << j))) + continue; + + bitmap_desc.pixelFormat.format = bitmap_formats[i].format; + bitmap_desc.pixelFormat.alphaMode = j; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + if (bitmap_formats[i].mask & (1u << j)) + ok(hr == S_OK, "Got unexpected hr %#x, for format %#x/%#x.\n", + hr, bitmap_formats[i].format, j); + else + ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#x, for format %#x/%#x.\n", + hr, bitmap_formats[i].format, j); + if (SUCCEEDED(hr)) + ID2D1Bitmap_Release(bitmap); + } + } + + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -1537,4 +1616,5 @@ START_TEST(d2d1) test_color_brush(); test_bitmap_brush(); test_path_geometry(); + test_bitmap_formats(); }

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetPixelFormat().
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: a2f41ed5b662999572a9f91a5660186af2d0b9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f41ed5b662999572a9f91a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 29 11:36:19 2015 +0200 d2d1: Implement d2d_bitmap_GetPixelFormat(). --- dlls/d2d1/bitmap.c | 8 +++++--- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 2439d79..be03b66 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -103,10 +103,11 @@ static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *ifac static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitmap *iface, D2D1_PIXEL_FORMAT *format) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, format %p.\n", iface, format); - format->format = DXGI_FORMAT_UNKNOWN; - format->alphaMode = D2D1_ALPHA_MODE_UNKNOWN; + *format = bitmap->format; return format; } @@ -242,6 +243,7 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target } bitmap->pixel_size = size; + bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0c564fa..96a0bb8 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -184,6 +184,7 @@ struct d2d_bitmap ID3D10ShaderResourceView *view; D2D1_SIZE_U pixel_size; + D2D1_PIXEL_FORMAT format; float dpi_x; float dpi_y; };

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetBitmap().
by Alexandre Julliard 29 Jul '15

29 Jul '15

Module: wine Branch: master Commit: d742887b7fe957108f59c1e8741dfd9c46fa86e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d742887b7fe957108f59c1e87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 29 11:36:20 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetBitmap(). --- dlls/d2d1/brush.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 5c45d3c..fb40f3d 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -501,6 +501,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) { if (brush->u.bitmap.sampler_state) ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + if (brush->u.bitmap.bitmap) + ID2D1Bitmap_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface); HeapFree(GetProcessHeap(), 0, brush); } @@ -598,7 +600,15 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapB static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap *bitmap) { - FIXME("iface %p, bitmap %p stub!\n", iface, bitmap); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, bitmap %p.\n", iface, bitmap); + + if (bitmap) + ID2D1Bitmap_AddRef(bitmap); + if (brush->u.bitmap.bitmap) + ID2D1Bitmap_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface); + brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); } static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeX(ID2D1BitmapBrush *iface) @@ -666,7 +676,8 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar d2d_brush_init(brush, &render_target->ID2D1RenderTarget_iface, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); - brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); + if ((brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap))) + ID2D1Bitmap_AddRef(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface); if (bitmap_brush_desc) { brush->u.bitmap.extend_mode_x = bitmap_brush_desc->extendModeX;

1 0