Henri Verbeet : wined3d: Reorder the formats in debug_d3dformat() to match the enum order.
Alexandre Julliard
julliard at winehq.org
Tue Sep 18 15:14:31 CDT 2018
Module: wine
Branch: master
Commit: 2e34d2e4578cf49ad6332221611a76639d45e7b6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e34d2e4578cf49ad6332221611a76639d45e7b6
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Sep 18 03:19:19 2018 +0430
wined3d: Reorder the formats in debug_d3dformat() to match the enum order.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/utils.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 9ffce6c..9d0a64b 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4141,18 +4141,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id)
FMT_TO_STR(WINED3DFMT_R10G10B10X2_UINT);
FMT_TO_STR(WINED3DFMT_R10G10B10X2_SNORM);
FMT_TO_STR(WINED3DFMT_R10G10B10_SNORM_A2_UNORM);
- FMT_TO_STR(WINED3DFMT_UYVY);
- FMT_TO_STR(WINED3DFMT_YUY2);
- FMT_TO_STR(WINED3DFMT_YV12);
- FMT_TO_STR(WINED3DFMT_NV12);
- FMT_TO_STR(WINED3DFMT_DXT1);
- FMT_TO_STR(WINED3DFMT_DXT2);
- FMT_TO_STR(WINED3DFMT_DXT3);
- FMT_TO_STR(WINED3DFMT_DXT4);
- FMT_TO_STR(WINED3DFMT_DXT5);
- FMT_TO_STR(WINED3DFMT_MULTI2_ARGB8);
- FMT_TO_STR(WINED3DFMT_G8R8_G8B8);
- FMT_TO_STR(WINED3DFMT_R8G8_B8G8);
FMT_TO_STR(WINED3DFMT_D16_LOCKABLE);
FMT_TO_STR(WINED3DFMT_D32_UNORM);
FMT_TO_STR(WINED3DFMT_S1_UINT_D15_UNORM);
@@ -4161,12 +4149,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id)
FMT_TO_STR(WINED3DFMT_L16_UNORM);
FMT_TO_STR(WINED3DFMT_S8_UINT_D24_FLOAT);
FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx);
- FMT_TO_STR(WINED3DFMT_ATI1N);
- FMT_TO_STR(WINED3DFMT_ATI2N);
- FMT_TO_STR(WINED3DFMT_INST);
- FMT_TO_STR(WINED3DFMT_NVDB);
- FMT_TO_STR(WINED3DFMT_NVHU);
- FMT_TO_STR(WINED3DFMT_NVHS);
FMT_TO_STR(WINED3DFMT_R32G32B32A32_TYPELESS);
FMT_TO_STR(WINED3DFMT_R32G32B32A32_FLOAT);
FMT_TO_STR(WINED3DFMT_R32G32B32A32_UINT);
@@ -4267,11 +4249,29 @@ const char *debug_d3dformat(enum wined3d_format_id format_id)
FMT_TO_STR(WINED3DFMT_BC7_TYPELESS);
FMT_TO_STR(WINED3DFMT_BC7_UNORM);
FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB);
+ FMT_TO_STR(WINED3DFMT_UYVY);
+ FMT_TO_STR(WINED3DFMT_YUY2);
+ FMT_TO_STR(WINED3DFMT_YV12);
+ FMT_TO_STR(WINED3DFMT_DXT1);
+ FMT_TO_STR(WINED3DFMT_DXT2);
+ FMT_TO_STR(WINED3DFMT_DXT3);
+ FMT_TO_STR(WINED3DFMT_DXT4);
+ FMT_TO_STR(WINED3DFMT_DXT5);
+ FMT_TO_STR(WINED3DFMT_MULTI2_ARGB8);
+ FMT_TO_STR(WINED3DFMT_G8R8_G8B8);
+ FMT_TO_STR(WINED3DFMT_R8G8_B8G8);
+ FMT_TO_STR(WINED3DFMT_ATI1N);
+ FMT_TO_STR(WINED3DFMT_ATI2N);
+ FMT_TO_STR(WINED3DFMT_INST);
+ FMT_TO_STR(WINED3DFMT_NVDB);
+ FMT_TO_STR(WINED3DFMT_NVHU);
+ FMT_TO_STR(WINED3DFMT_NVHS);
FMT_TO_STR(WINED3DFMT_INTZ);
FMT_TO_STR(WINED3DFMT_RESZ);
FMT_TO_STR(WINED3DFMT_NULL);
FMT_TO_STR(WINED3DFMT_R16);
FMT_TO_STR(WINED3DFMT_AL16);
+ FMT_TO_STR(WINED3DFMT_NV12);
#undef FMT_TO_STR
default:
{
More information about the wine-cvs
mailing list