~thopiekar/wine/+git/wine-debian:upstream

Last commit made on 2018-04-05
Get this branch:
git clone -b upstream https://git.launchpad.net/~thopiekar/wine/+git/wine-debian

Branch merges

Branch information

Name:
upstream
Repository:
lp:~thopiekar/wine/+git/wine-debian

Recent commits

a36252d... by Michael Gilbert <email address hidden>

Merge tag 'wine-3.5' of git://source.winehq.org/git/wine into upstream

Release 3.5

# gpg: Signature made Fri 30 Mar 2018 05:30:27 PM UTC
# gpg: using RSA key DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
# gpg: Good signature from "Alexandre Julliard <email address hidden>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DA23 579A 74D4 AD9A F9D3 F945 CEFA C8EA AF17 519D

df6a441... by Michael Gilbert <email address hidden>

Merge tag 'wine-3.4' of git://source.winehq.org/git/wine into upstream

Release 3.4

# gpg: Signature made Fri 16 Mar 2018 06:50:20 PM UTC
# gpg: using RSA key DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D
# gpg: Good signature from "Alexandre Julliard <email address hidden>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DA23 579A 74D4 AD9A F9D3 F945 CEFA C8EA AF17 519D

79f93ec... by Alexandre Julliard

Release 3.5.

Signed-off-by: Alexandre Julliard <email address hidden>

8a763d9... by Jacek Caban <email address hidden>

windowscodecs: Cache component info objects.

Signed-off-by: Jacek Caban <email address hidden>
Signed-off-by: Vincent Povirk <email address hidden>
Signed-off-by: Alexandre Julliard <email address hidden>

0c8dc2b... by Jacek Caban <email address hidden>

windowscodecs: Use common base structure for component info implementations.

Signed-off-by: Jacek Caban <email address hidden>
Signed-off-by: Vincent Povirk <email address hidden>
Signed-off-by: Alexandre Julliard <email address hidden>

dcbbddf... by Henri Verbeet <email address hidden>

wined3d: Add some traces to arbfp_blitter_blit().

Signed-off-by: Henri Verbeet <email address hidden>
Signed-off-by: Alexandre Julliard <email address hidden>

267a154... by Henri Verbeet <email address hidden>

wined3d: Add some traces to fbo_blitter_blit().

For easier debugging.

Signed-off-by: Henri Verbeet <email address hidden>
Signed-off-by: Alexandre Julliard <email address hidden>

e7af1ea... by Henri Verbeet <email address hidden>

wined3d: Avoid a FIXME about 0 back-buffer usage in wined3d_device_reset().

Since we use this for ddraw now.

Signed-off-by: Henri Verbeet <email address hidden>
Signed-off-by: Alexandre Julliard <email address hidden>

f93691d... by Henri Verbeet <email address hidden>

wined3d: Get rid of convert_p8_uint_b8g8r8a8_unorm().

Perhaps this made sense when we still pretended to support P8 textures, but
currently this should never get used, and certainly not in the colour-keying
path.

Signed-off-by: Henri Verbeet <email address hidden>
Signed-off-by: Alexandre Julliard <email address hidden>

a362dae... by Henri Verbeet <email address hidden>

ddraw: Copy the entire front-buffer surface after a buffer swap.

wined3d_swapchain_present() will invalidate everything except
WINED3D_LOCATION_DRAWABLE, which means a partial blit to the front-buffer
afterwards might need to read the drawable contents back to the texture. For
P8 front-buffers that's problematic, because the original palette indices are
lost. We may want to improve the wined3d side of this to avoid reading back
the drawable, but copying the entire surface in ddraw in this situation seems
like a good idea regardless.

Signed-off-by: Henri Verbeet <email address hidden>
Signed-off-by: Alexandre Julliard <email address hidden>