Henri Verbeet : wined3d: Move some macros to directx.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 005eb0bd7dee3202069c0a908f2ac5a03c24c817
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=005eb0bd7dee3202069c0a908f...

Author: Henri Verbeet 
Date:   Mon Jan 25 19:51:32 2010 +0100

wined3d: Move some macros to directx.c.

Nothing GL specific about these.

---

dlls/wined3d/directx.c    |    2 ++
 dlls/wined3d/wined3d_gl.h |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ba9fdb8..6183c4c 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_caps);

#define GLINFO_LOCATION (*gl_info)
+#define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024)
+#define MAKEDWORD_VERSION(maj, min)  ((maj & 0xffff) << 16) | (min & 0xffff)

/* The d3d device ID */
 static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } };
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 33e24c3..306de2a 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -4567,9 +4567,6 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma
     USE_GL_FUNC(WINED3D_PFNWGLQUERYPBUFFERARBPROC,              wglQueryPbufferARB,             0, NULL) \
     USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE,               wglSetPixelFormatWINE,          0, NULL)

-#define WINE_DEFAULT_VIDMEM 64*1024*1024
-#define MAKEDWORD_VERSION(maj, min)  ((maj & 0x0000FFFF) << 16) | (min & 0x0000FFFF)
-
 struct wined3d_fbo_ops
 {
     PGLFNGLISRENDERBUFFERPROC                       glIsRenderbuffer;