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

Correct Author of DXTn patches

Browse Source 
The changes to make it a local library doesn't justify changing
the origial author.
This commit is contained in:
Alistair Leslie-Hughes
2018-07-31 08:10:54 +10:00
parent 1de1a96f1e
commit e1fb783018
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
From aa9f7ab6959ae6ec936d02b553fc99e259bb0ea5 Mon Sep 17 00:00:00 2001
From: Kyle Devir <kyle.devir@mykolab.com>
From 7dd189fb2256e64540fce8dfddc499ce41e01675 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
@@ -16,7 +16,7 @@ Subject: [PATCH] wined3d: add DXTn support
create mode 100644 dlls/wined3d/dxtn.h
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index 58fc2d5f42..b850ba6872 100644
index 58fc2d5..b850ba6 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -10,6 +10,7 @@ C_SRCS = \
@@ -29,7 +29,7 @@ index 58fc2d5f42..b850ba6872 100644
nvidia_texture_shader.c \
diff --git a/dlls/wined3d/dxtn.c b/dlls/wined3d/dxtn.c
new file mode 100644
index 0000000000..4e24fb5641
index 0000000..4e24fb5
--- /dev/null
+++ b/dlls/wined3d/dxtn.c
@@ -0,0 +1,435 @@
@@ -470,7 +470,7 @@ index 0000000000..4e24fb5641
+}
diff --git a/dlls/wined3d/dxtn.h b/dlls/wined3d/dxtn.h
new file mode 100644
index 0000000000..23536c091c
index 0000000..23536c0
--- /dev/null
+++ b/dlls/wined3d/dxtn.h
@@ -0,0 +1,987 @@
@@ -1462,10 +1462,10 @@ index 0000000000..23536c091c
+ }
+}
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index b94b07ba6e..dcc46742e2 100644
index 5502d05..d75dbdb 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1046,6 +1046,126 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
@@ -800,6 +800,126 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
}
}
@@ -1592,7 +1592,7 @@ index b94b07ba6e..dcc46742e2 100644
struct d3dfmt_converter_desc
{
enum wined3d_format_id from, to;
@@ -1062,6 +1182,33 @@ static const struct d3dfmt_converter_desc converters[] =
@@ -816,6 +936,33 @@ static const struct d3dfmt_converter_desc converters[] =
{WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5},
};
@@ -1626,7 +1626,7 @@ index b94b07ba6e..dcc46742e2 100644
static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from,
enum wined3d_format_id to)
{
@@ -1073,6 +1220,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
@@ -827,6 +974,12 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
return &converters[i];
}
@@ -1640,10 +1640,10 @@ index b94b07ba6e..dcc46742e2 100644
}
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index f35d83d7cd..ec71d662a2 100644
index 93cecf0..78cf50d 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -324,3 +324,10 @@
@@ -314,3 +314,10 @@
@ cdecl wined3d_vertex_declaration_decref(ptr)
@ cdecl wined3d_vertex_declaration_get_parent(ptr)
@ cdecl wined3d_vertex_declaration_incref(ptr)
@@ -1655,7 +1655,7 @@ index f35d83d7cd..ec71d662a2 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_main.c b/dlls/wined3d/wined3d_main.c
index 56fae6b3f9..acafe3deb9 100644
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)
@@ -1667,10 +1667,10 @@ index 56fae6b3f9..acafe3deb9 100644
}
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index c74ea77964..b3d33b54a2 100644
index 239ccd8..614805a 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2779,4 +2779,17 @@ static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, u
@@ -2793,4 +2793,17 @@ static inline void wined3d_box_set(struct wined3d_box *box, unsigned int left, u
box->back = back;
}
@@ -1689,5 +1689,5 @@ index c74ea77964..b3d33b54a2 100644
+
#endif /* __WINE_WINED3D_H */
--
2.16.3
1.9.1