d3d1x: define GUIDs in the normal way

diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
index 83cf0f2c3e4970a8e8d884dbd58b91715e55e1e4..7627720148d7735fe34a6fc05a51181b119d9fdc 100644 (file)
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
@@ -42,20 +42,6 @@ namespace std
 #include <utility>
 
 #define WIN32_LEAN_AND_MEAN
-#define INITGUID
-#include <guiddef.h>
-
-// just replicate GUIDs in every object file to avoid the hassle of having to pull in a library for them
-#ifdef __GNUC__
-#define ATTRIBUTE_UNUSED __attribute__((unused))
-#else
-#define ATTRIBUTE_UNUSED
-#endif
-#undef DEFINE_GUID
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        static const GUID name ATTRIBUTE_UNUSED = \
-       { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-
 #include <objbase.h>
 #include <specstrings.h>
 

diff --git a/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp b/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
index ddba68518af8250c78422fe623ad59d299548e26..0fcef0d7b69b2be3a18cfebc7eee648368ae2c6f 100755 (executable)
--- a/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
+++ b/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
@@ -24,7 +24,6 @@
  *\r
  **************************************************************************/\r
 \r
-#define INITGUID\r
 #include "d3d10app.h"\r
 #include <X11/Xlib.h>\r
 #include <GL/glx.h>\r

diff --git a/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp b/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
index 7e1edeb6355f2d113a2dca4ccba352182a02ec5f..7055da941b75afffa7de8a8061f31686ea0bac46 100755 (executable)
--- a/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
+++ b/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
@@ -1,4 +1,3 @@
-#define INITGUID\r
 #include "d3d11app.h"\r
 #include <X11/Xlib.h>\r
 #include <GL/glx.h>\r