Ivan Gyurdiev : wined3d: D3DDEVTYPE: Consistently use in WINED3D
namespace.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Oct 11 05:52:37 CDT 2006
Module: wine
Branch: master
Commit: 19c5534c3564e0fcead8f64c7906c8806001023d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c5534c3564e0fcead8f64c7906c8806001023d
Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date: Tue Oct 10 21:52:00 2006 -0400
wined3d: D3DDEVTYPE: Consistently use in WINED3D namespace.
---
dlls/wined3d/utils.c | 10 +++++-----
dlls/wined3d/wined3d_private.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index f3f7a1f..b8c6b5d 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -216,15 +216,15 @@ #undef FMT_TO_STR
}
}
-const char* debug_d3ddevicetype(D3DDEVTYPE devtype) {
+const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype) {
switch (devtype) {
#define DEVTYPE_TO_STR(dev) case dev: return #dev
- DEVTYPE_TO_STR(D3DDEVTYPE_HAL);
- DEVTYPE_TO_STR(D3DDEVTYPE_REF);
- DEVTYPE_TO_STR(D3DDEVTYPE_SW);
+ DEVTYPE_TO_STR(WINED3DDEVTYPE_HAL);
+ DEVTYPE_TO_STR(WINED3DDEVTYPE_REF);
+ DEVTYPE_TO_STR(WINED3DDEVTYPE_SW);
#undef DEVTYPE_TO_STR
default:
- FIXME("Unrecognized %u D3DDEVTYPE!\n", devtype);
+ FIXME("Unrecognized %u WINED3DDEVTYPE!\n", devtype);
return "unrecognized";
}
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 765aea9..9d4fd9f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -529,7 +529,7 @@ #define NEEDS_DI
/* Internal use fields */
WINED3DDEVICE_CREATION_PARAMETERS createParms;
UINT adapterNo;
- D3DDEVTYPE devType;
+ WINED3DDEVTYPE devType;
IWineD3DSwapChain **swapchains;
uint NumberOfSwapChains;
@@ -1245,7 +1245,7 @@ extern IWineD3DSwapChainVtbl IWineD3DSwa
/* Trace routines */
const char* debug_d3dformat(WINED3DFORMAT fmt);
-const char* debug_d3ddevicetype(D3DDEVTYPE devtype);
+const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype);
const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res);
const char* debug_d3dusage(DWORD usage);
const char* debug_d3dusagequery(DWORD usagequery);
More information about the wine-cvs
mailing list