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 ccf6211c0ae6e86218f7e6c1f2fe725a23e568b9.

Browse Source
This commit is contained in:
Zebediah Figura
2018-08-16 23:11:33 -05:00
parent 06c1bde586
commit 93e4c328d7
20 changed files with 142 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
patches/wined3d-DXTn/0001-wined3d-add-DXTn-support.patch
View File

@@ -1,17 +1,16 @@
From 7dd189fb2256e64540fce8dfddc499ce41e01675 Mon Sep 17 00:00:00 2001
From e1402515ec1008c3393d434a1016a717c791bd62 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Fri, 30 Mar 2018 08:25:44 +0000
Subject: [PATCH] wined3d: add DXTn support
---
dlls/wined3d/Makefile.in | 1 +
dlls/wined3d/dxtn.c | 435 +++++++++++++++++++
dlls/wined3d/dxtn.h | 987 ++++++++++++++++++++++++++++++++++++++++++++
dlls/wined3d/surface.c | 153 +++++++
dlls/wined3d/wined3d.spec | 7 +
dlls/wined3d/wined3d_main.c | 1 +
include/wine/wined3d.h | 13 +
7 files changed, 1597 insertions(+)
dlls/wined3d/Makefile.in | 1 +
dlls/wined3d/dxtn.c | 435 ++++++++++++++++++++
dlls/wined3d/dxtn.h | 987 ++++++++++++++++++++++++++++++++++++++++++++++
dlls/wined3d/surface.c | 153 +++++++
dlls/wined3d/wined3d.spec | 7 +
include/wine/wined3d.h | 13 +
6 files changed, 1596 insertions(+)
create mode 100644 dlls/wined3d/dxtn.c
create mode 100644 dlls/wined3d/dxtn.h
@@ -1462,10 +1461,10 @@ index 0000000..23536c0
+ }
+}
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 5502d05..d75dbdb 100644
index ba0b647..30421b9 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -800,6 +800,126 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
@@ -820,6 +820,126 @@ static void convert_x8r8g8b8_l8(const BYTE *src, BYTE *dst,
}
}
@@ -1592,8 +1591,8 @@ index 5502d05..d75dbdb 100644
struct d3dfmt_converter_desc
{
enum wined3d_format_id from, to;
@@ -816,6 +936,33 @@ static const struct d3dfmt_converter_desc converters[] =
{WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5},
@@ -837,6 +957,33 @@ static const struct d3dfmt_converter_desc converters[] =
{WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_L8_UNORM, convert_x8r8g8b8_l8},
};
+static const struct d3dfmt_converter_desc dxtn_converters[] =
@@ -1626,7 +1625,7 @@ index 5502d05..d75dbdb 100644
static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from,
enum wined3d_format_id to)
{
@@ -827,6 +974,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
@@ -848,6 +995,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
return &converters[i];
}
@@ -1654,18 +1653,6 @@ index 93cecf0..78cf50d 100644
+@ cdecl wined3d_dxt3_encode(ptr ptr long long long long long)
+@ 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_main.c b/dlls/wined3d/wined3d_main.c
index f8a84a1..0fc3738 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -349,6 +349,7 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL)
DeleteCriticalSection(&wined3d_wndproc_cs);
DeleteCriticalSection(&wined3d_cs);
+
return TRUE;
}
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 239ccd8..614805a 100644
--- a/include/wine/wined3d.h
@@ -1689,5 +1676,5 @@ index 239ccd8..614805a 100644
+
#endif /* __WINE_WINED3D_H */
--
1.9.1
2.7.4

1
patches/wined3d-DXTn/definition
View File

@@ -2,3 +2,4 @@ Fixes: [25486] Lego Stunt Rally requires DXTn software de/encoding support
Fixes: [29586] Tumblebugs 2 requires DXTn software encoding support
# Fixes: [14939] Black & White needs DXTn software decoding support
Fixes: [17913] Port Royale doesn't display ocean correctly
Depends: wined3d-WINED3DFMT_B8G8R8X8_UNORM