marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
135,113 Commits
5 Branches
0 Tags
985 MiB
Commit Graph

365 Commits (aa0e7aa1fd6b34b223b48ce84d65e437a00d0693)

Author SHA1 Message Date
Akihiro Sagawa 9023c5a676 d2d1: Improve bitmap creation DPI handling. 
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-10-27 19:15:19 +01:00
Akihiro Sagawa 9a808acbd5 d2d1: Don't update device context DPI values when changing targets. 
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-10-27 19:15:17 +01:00
Akihiro Sagawa 44a3be9177 d2d1/tests: Add some DPI tests. 
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-10-27 19:15:13 +01:00
Brendan Shanks 940c3b4896 d2d1: Only create shader resource views for drawable bitmaps. 
The underlying resource for bitmaps created with
D2D1_BITMAP_OPTIONS_CANNOT_DRAW doesn't necessarily have
D3D10_BIND_SHADER_RESOURCE in its bind flags.

Original patch by Robin Kertels <robin.kertels@gmail.com>

Signed-off-by: Brendan Shanks <bshanks@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-09-25 21:11:22 +02:00
Alexandre Julliard 3feed5a23f d2d1: Make qsort() callback functions cdecl. 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-08-22 09:56:00 +02:00
Nikolay Sivov 436fb03a87 d2d1: Remove unused function. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-07-02 20:43:37 +02:00
Alexandre Julliard 239499a56d d2d1: Build with msvcrt. 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-05-30 15:04:06 +02:00
Francois Gouget 1684b01118 Disable multithreaded DirectX tests if WINETEST_NO_MT_D3D is set. 
The nouveau graphics driver's support for multithreaded OpenGL is
buggy at least up to (18.2.8) so that any Wine test that performs
multithreaded OpenGL accesses freezes, crashes the Mesa stack and
eventually freezes the whole computer. Typically the first such test
is d2d1:d2d1.
The relevant tests have a --single option but WineTest neither knows
which tests accept this option, nor whether it is needed for the
current host.
The WINETEST_NO_MT_D3D environnement variable can be set on hosts
that need it (such as the cw2-gtx560 box) and is automatically
inherited by the relevant tests thus working around this issue.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-04-03 20:35:44 +02:00
Nikolay Sivov 414c6b48ed d2d1/tests: Add some missing EndDraw() checks (Coverity). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-03-06 18:30:48 +01:00
Nikolay Sivov a777fd85cb d2d1: Add ID2D1GeometryGroup stub. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2019-02-12 23:02:28 +01:00
Nikolay Sivov b5e9896370 d2d1: Implement GetMaximumBitmapSize(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-11-12 16:44:15 +01:00
Nikolay Sivov 8effa4da69 d2d1/tests: Test command list resource reference. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-29 17:00:47 +01:00
Nikolay Sivov 926d98ef85 d2d1: Add ID2D1Factory2 stub. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-26 10:12:44 +02:00
Nikolay Sivov 7ef66068f2 d2d1: Implement d2d_device_context_ID2D1DeviceContext_DrawGlyphRun(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-23 13:55:39 +02:00
Nikolay Sivov 0ab7118503 d2d1: Return S_OK from d2d_effect_SetValue(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-18 19:48:46 +02:00
Nikolay Sivov 48bcae100e d2d1: Return S_OK from RegisterEffectFromString(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-18 19:48:44 +02:00
Daniel Ansorregui e55aca8f49 d2d1: Use default NULL argument in SetBlendState call. 
Signed-off-by: Daniel Ansorregui <mailszeros@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-16 22:26:07 +02:00
Nikolay Sivov cc4b28a99d d2d1: Check the context error state on entering d2d_device_context_DrawGlyphRun(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-08 20:27:10 +02:00
Henri Verbeet 502bcfe2c6 d2d1: Do not release the "dxgi_target" interface on d2d_bitmap_render_target_init() error paths. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-08 20:26:50 +02:00
Nikolay Sivov c4c5353820 d2d1: Add a helper to set error state. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-05 11:25:46 -05:00
Nikolay Sivov 5cc501b0a9 d2d1: Partially implement d2d_device_context_ID2D1DeviceContext_DrawBitmap(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-04 09:22:43 -05:00
Nikolay Sivov 56703ff9a6 d2d1: Handle invalid interpolation mode in DrawBitmap(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-04 09:22:40 -05:00
Nikolay Sivov 00b40eac91 d2d1: Use correct interpolation mode enum type member. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-04 09:22:36 -05:00
Nikolay Sivov 275a44a419 d2d1: Implement D2D1MakeSkewMatrix(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-03 16:22:18 -05:00
Nikolay Sivov 827f19a690 d2d1: Implement d2d_device_context_ID2D1DeviceContext_CreateBitmapFromWicBitmap(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-03 16:22:13 -05:00
Nikolay Sivov feea46a187 d2d1/tests: Add a test for BeginDraw() with locked WIC bitmap. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-03 16:22:10 -05:00
Nikolay Sivov c96eba60e3 d2d1: Simplify target bitmap creation for DC target. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-02 19:38:07 -07:00
Nikolay Sivov 8b3081e305 d2d1: Set GDI compatible resource flag from bitmap options. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-02 19:38:04 -07:00
Nikolay Sivov f2429e3109 d2d1: Fix bind flags used for bitmap resources. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-02 19:38:02 -07:00
Nikolay Sivov d227553f57 d2d1: Implement CreateDeviceContext(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-10-02 19:37:59 -07:00
Nikolay Sivov 86f1ab36a9 d2d1: Implement d2d_device_context_SetTarget() for bitmap targets. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-30 10:59:35 +02:00
Nikolay Sivov f60455be90 d2d1: Default to pre-multiplied alpha mode in CreateBitmapFromDxgiSurface(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-30 10:59:31 +02:00
Nikolay Sivov cc8d53affe d2d1: Allow creating zero-sized bitmaps. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-30 10:59:29 +02:00
Nikolay Sivov 9775ed22aa d2d1: Implement d2d_device_context_ID2D1DeviceContext_CreateBitmap(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-30 10:59:23 +02:00
Nikolay Sivov 1987c1fba4 d2d1/tests: Add some tests for compatible target size handling. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-30 10:59:17 +02:00
Nikolay Sivov bf5066a3ff d2d1: Use surface format for shared bitmap if it wasn't specified. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-26 20:25:52 +02:00
Nikolay Sivov 62259297c4 d2d1: Add ID2D1Effect stub. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-26 20:25:43 +02:00
Henri Verbeet ced1590255 d2d1: Introduce a debug helper for D2D1_POINT_2F. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-25 12:29:00 +02:00
Nikolay Sivov 31808b08db d2d1: Implement GetDevice() for device context. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-24 22:41:30 +02:00
Nikolay Sivov 7c4f85ed06 d2d1/tests: Test that device is reused for compatible targets. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-24 22:41:30 +02:00
Nikolay Sivov dc67508338 d2d1: Fix compatible target initialization. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-24 22:41:30 +02:00
Nikolay Sivov bdd3f7b1ee d2d1: Implement CreateBitmapFromDxgiSurface(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-19 17:22:09 +02:00
Nikolay Sivov 0b6c1bf5b1 d2d1: Implement newer CreateBitmapBrush() variant. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-18 20:59:38 +02:00
Nikolay Sivov c9b76c3a7f d2d1: Update to ID2D1BitmapBrush1. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-18 20:59:38 +02:00
Nikolay Sivov ef6a8dc16d d2d1: Implement GetSurface() for bitmaps. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-17 15:38:28 +02:00
Nikolay Sivov 8b3a7c2581 d2d1: Update to ID2D1DrawingStateBlock1. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-14 19:09:42 +02:00
Nikolay Sivov bccd14f2f6 d2d1: Return bitmap options. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-13 19:17:14 +02:00
Henri Verbeet 364e11b0ec d2d1: Simplify the WIC render target implementation. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-12 23:15:26 +02:00
Nikolay Sivov a7d8471638 d2d1: Properly aggregate render target implementations. 
In order to expose the ID2D1DeviceContext interface for them.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-09-12 23:15:24 +02:00
Nikolay Sivov dcd530b422 d2d1: Implement matrix inversion functions. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2018-08-27 17:34:37 +02:00