wined3d: Add D3DFMT_L16

Jan Zerebecki jan.wine at zerebecki.de
Tue Apr 4 08:34:46 CDT 2006


If this patch is rejected from inclusion, please tell me why, as i would have to
ask anyway.

From: Jan Zerebecki <jan.wine at zerebecki.de>
Changelog:
wined3d: Add D3DFMT_L16
and rearange formats in debug_d3dformat to be in the same order
as in the header.
---

 dlls/wined3d/utils.c         |    5 +++--
 include/d3d9types.h          |    1 +
 include/wine/wined3d_types.h |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 742ac03..aca6147 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -35,7 +35,6 @@ const char* debug_d3dformat(WINED3DFORMA
     FMT_TO_STR(WINED3DFMT_UNKNOWN);
     FMT_TO_STR(WINED3DFMT_R8G8B8);
     FMT_TO_STR(WINED3DFMT_A8R8G8B8);
-    FMT_TO_STR(WINED3DFMT_A8B8G8R8);
     FMT_TO_STR(WINED3DFMT_X8R8G8B8);
     FMT_TO_STR(WINED3DFMT_R5G6B5);
     FMT_TO_STR(WINED3DFMT_X1R5G5B5);
@@ -46,6 +45,7 @@ const char* debug_d3dformat(WINED3DFORMA
     FMT_TO_STR(WINED3DFMT_A8R3G3B2);
     FMT_TO_STR(WINED3DFMT_X4R4G4B4);
     FMT_TO_STR(WINED3DFMT_A2B10G10R10);
+    FMT_TO_STR(WINED3DFMT_A8B8G8R8);
     FMT_TO_STR(WINED3DFMT_X8B8G8R8);
     FMT_TO_STR(WINED3DFMT_G16R16);
     FMT_TO_STR(WINED3DFMT_A2R10G10B10);
@@ -76,11 +76,12 @@ const char* debug_d3dformat(WINED3DFORMA
     FMT_TO_STR(WINED3DFMT_D32);
     FMT_TO_STR(WINED3DFMT_D15S1);
     FMT_TO_STR(WINED3DFMT_D24S8);
-    FMT_TO_STR(WINED3DFMT_D24FS8);
     FMT_TO_STR(WINED3DFMT_D24X8);
     FMT_TO_STR(WINED3DFMT_D24X4S4);
     FMT_TO_STR(WINED3DFMT_D16);
+    FMT_TO_STR(WINED3DFMT_L16);
     FMT_TO_STR(WINED3DFMT_D32F_LOCKABLE);
+    FMT_TO_STR(WINED3DFMT_D24FS8);
     FMT_TO_STR(WINED3DFMT_VERTEXDATA);
     FMT_TO_STR(WINED3DFMT_INDEX16);
     FMT_TO_STR(WINED3DFMT_INDEX32);
diff --git a/include/d3d9types.h b/include/d3d9types.h
index be3f947..3c4b8a1 100644
--- a/include/d3d9types.h
+++ b/include/d3d9types.h
@@ -816,6 +816,7 @@ typedef enum _D3DFORMAT {
     D3DFMT_D24X8                =  77,
     D3DFMT_D24X4S4              =  79,
     D3DFMT_D16                  =  80,
+    D3DFMT_L16                  =  81,
     D3DFMT_D32F_LOCKABLE        =  82,
     D3DFMT_D24FS8               =  83,
 
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 60fa601..05a63ab 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -184,6 +184,7 @@ typedef enum _WINED3DFORMAT {
     WINED3DFMT_D24X8                =  77,
     WINED3DFMT_D24X4S4              =  79,
     WINED3DFMT_D16                  =  80,
+    WINED3DFMT_L16                  =  81,
     WINED3DFMT_D32F_LOCKABLE        =  82,
     WINED3DFMT_D24FS8               =  83,
 



More information about the wine-patches mailing list