wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 47cf3fe36d4f5a2f83c0d48ee763c256cd6010c5.

Browse Source 
[winscard-SCardListReaders]
Removed patch to add stub for winscard.SCardListReadersA/W.
This commit is contained in:
Sebastian Lackner
2016-03-24 17:39:04 +01:00
parent a748bea862
commit b550faff6a
5 changed files with 16 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/wined3d-DXTn/0001-wined3d-Add-support-for-DXTn-software-decoding-throu.patch
View File

@@ -1,4 +1,4 @@
From a6713e2781707331b3ceff9465ff01aa0a49b414 Mon Sep 17 00:00:00 2001
From befa34d0d694caed1a57eb006769aa7da4f6d08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 20 Sep 2014 02:48:07 +0200
Subject: wined3d: Add support for DXTn software decoding through libtxc_dxtn.
@@ -353,10 +353,10 @@ index 0000000..ce98949
+ wine_dlclose(txc_dxtn_handle, NULL, 0);
+}
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c11d248..51085ad 100644
index ceea4fe..d66f873 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1729,6 +1729,66 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
@@ -1697,6 +1697,66 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
}
}
@@ -423,7 +423,7 @@ index c11d248..51085ad 100644
struct d3dfmt_converter_desc
{
enum wined3d_format_id from, to;
@@ -1745,6 +1805,20 @@ static const struct d3dfmt_converter_desc converters[] =
@@ -1713,6 +1773,20 @@ static const struct d3dfmt_converter_desc converters[] =
{WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5},
};
@@ -444,7 +444,7 @@ index c11d248..51085ad 100644
static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from,
enum wined3d_format_id to)
{
@@ -1756,6 +1830,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
@@ -1724,6 +1798,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
return &converters[i];
}
@@ -481,11 +481,11 @@ index 71dc180..fdb260e 100644
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index feb86d1..3596d00 100644
index 7b7b65b..294a33b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3434,6 +3434,19 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context,
&& fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE;
@@ -3441,6 +3441,19 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info
&& !is_scaling_fixup(format->color_fixup);
}
+BOOL wined3d_dxt1_decode(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out,

14
patches/wined3d-DXTn/0002-wined3d-Improve-DXTn-support-and-export-conversion-f.patch
View File

@@ -1,4 +1,4 @@
From 4480ebf8d1c6633f1a816e9c4e9a7ef909464212 Mon Sep 17 00:00:00 2001
From 694bf8f53066b05b60ffa0f54ca642d3482e61da Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Tue, 4 Nov 2014 22:41:45 +0100
Subject: wined3d: Improve DXTn support and export conversion functions for
@@ -153,10 +153,10 @@ index ce98949..77f7d55 100644
#undef LOAD_FUNCPTR
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 51085ad..b9e138a 100644
index d66f873..0126ff3 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1741,6 +1741,30 @@ static void convert_dxt1_x8r8g8b8(const BYTE *src, BYTE *dst,
@@ -1709,6 +1709,30 @@ static void convert_dxt1_x8r8g8b8(const BYTE *src, BYTE *dst,
wined3d_dxt1_decode(src, dst, pitch_in, pitch_out, WINED3DFMT_B8G8R8X8_UNORM, w, h);
}
@@ -187,7 +187,7 @@ index 51085ad..b9e138a 100644
static void convert_a8r8g8b8_dxt1(const BYTE *src, BYTE *dst,
DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
{
@@ -1807,8 +1831,15 @@ static const struct d3dfmt_converter_desc converters[] =
@@ -1775,8 +1799,15 @@ static const struct d3dfmt_converter_desc converters[] =
static const struct d3dfmt_converter_desc dxtn_converters[] =
{
@@ -220,11 +220,11 @@ index 7c90d60..00bd34d 100644
+@ cdecl wined3d_dxt5_decode(ptr ptr long long long long long)
+@ cdecl wined3d_dxt5_encode(ptr ptr long long long long long)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3596d00..bad111f 100644
index 294a33b..aa9126f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3434,17 +3434,7 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context,
&& fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE;
@@ -3441,17 +3441,7 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info
&& !is_scaling_fixup(format->color_fixup);
}
-BOOL wined3d_dxt1_decode(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out,