wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Update DXTn patch against upstream changes.

Browse Source
This commit is contained in:
Erich E. Hoover 2014-12-10 18:11:48 -07:00
parent 26f47c8dd8
commit 7ba4197cbe
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/Makefile
View File

@ -277,16 +277,14 @@ atl-IOCS_Property.ok:
# | Modified files:
# | * configure.ac, dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec,
# | dlls/combase/Makefile.in, dlls/combase/combase.spec, dlls/combase/string.c, dlls/combase/tests/Makefile.in,
# | dlls/combase/tests/string.c, include/Makefile.in, include/hstring.h, include/winstring.h, tools/make_specfiles
# | dlls/combase/tests/string.c, tools/make_specfiles
# |
.INTERMEDIATE: combase-HSTRING.ok
combase-HSTRING.ok:
$(call APPLY_FILE,combase-HSTRING/0001-include-Add-hstring.h-and-winstring.h.patch)
$(call APPLY_FILE,combase-HSTRING/0002-combase-Implement-creation-and-deletion-of-HSTRING-o.patch)
$(call APPLY_FILE,combase-HSTRING/0003-combase-Implement-functions-for-accessing-HSTRING-ob.patch)
$(call APPLY_FILE,combase-HSTRING/0004-combase-Implement-functions-for-HSTRING_BUFFER.patch)
$(call APPLY_FILE,combase-HSTRING/0001-combase-Implement-creation-and-deletion-of-HSTRING-o.patch)
$(call APPLY_FILE,combase-HSTRING/0002-combase-Implement-functions-for-accessing-HSTRING-ob.patch)
$(call APPLY_FILE,combase-HSTRING/0003-combase-Implement-functions-for-HSTRING_BUFFER.patch)
@( \
echo '+ { "Martin Storsjo", "include: Add hstring.h and winstring.h.", 1 },'; \
echo '+ { "Martin Storsjo", "combase: Implement creation and deletion of HSTRING objects.", 1 },'; \
echo '+ { "Martin Storsjo", "combase: Implement functions for accessing HSTRING objects.", 1 },'; \
echo '+ { "Martin Storsjo", "combase: Implement functions for HSTRING_BUFFER.", 1 },'; \

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

@ -1,4 +1,4 @@
From eea72aef0b19779822191f8dc858fa282cc4bfb0 Mon Sep 17 00:00:00 2001
From 4222334f4c1f6107fc323149456c8684ace91a86 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
@ -254,10 +254,10 @@ index 7a77003..eca8875 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 45c68b3..878ac3a 100644
index e47f5ce..8112cbc 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3133,11 +3133,6 @@ static inline void context_apply_state(struct wined3d_context *context,
@@ -3151,11 +3151,6 @@ static inline void context_apply_state(struct wined3d_context *context,
state_table[rep].apply(context, state, rep);
}
@ -270,12 +270,12 @@ index 45c68b3..878ac3a 100644
void wined3d_dxtn_free(void);
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 8f563bb..1aa2446 100644
index 0cf26e1..3e3ac86 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2547,4 +2547,11 @@ HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume,
void __cdecl wined3d_volume_preload(struct wined3d_volume *volume);
HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume);
@@ -2590,4 +2590,11 @@ static inline unsigned int wined3d_log2i(unsigned int x)
#endif
}
+BOOL wined3d_dxt1_decode(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, enum wined3d_format_id format, unsigned int w, unsigned int h);
+BOOL wined3d_dxt1_encode(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, enum wined3d_format_id format, unsigned int w, unsigned int h);
@ -286,5 +286,5 @@ index 8f563bb..1aa2446 100644
+
#endif /* __WINE_WINED3D_H */
--
2.1.3
1.9.1