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

Browse Source
This commit is contained in:
Sebastian Lackner
2015-10-08 19:16:54 +02:00
parent 1ab89ae9bc
commit fbce85675d
4 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 19f7f6dca9ea99ec2bef50ff38f57d23d7a8691a Mon Sep 17 00:00:00 2001
From c854dbc58038ba88a496c2775cf5c48dc1a2a7c2 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
@@ -204,13 +204,13 @@ index 140b411..0a9f68d 100644
{WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_DXT1, convert_x8r8g8b8_dxt1},
{WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_DXT1, convert_a1r5g5b5_dxt1},
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 0efa91c..5b8b153 100644
index c4ebd35..bb8f6f2 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -284,3 +284,11 @@
@@ -282,3 +282,11 @@
@ cdecl wined3d_vertex_declaration_decref(ptr)
@ cdecl wined3d_vertex_declaration_get_parent(ptr)
@ cdecl wined3d_vertex_declaration_incref(ptr)
@ cdecl wined3d_volume_get_resource(ptr)
+
+@ cdecl wined3d_dxtn_supported()
+@ cdecl wined3d_dxt1_decode(ptr ptr long long long long long)
@@ -242,10 +242,10 @@ index f6dd1a2..182e4d6 100644
/* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 7422545..cb85da4 100644
index a354308..e9e4041 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2601,4 +2601,18 @@ static inline unsigned int wined3d_log2i(unsigned int x)
@@ -2599,4 +2599,18 @@ static inline unsigned int wined3d_log2i(unsigned int x)
#endif
}