summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-09-22 19:31:54 +0200
committerLuca Barbieri <luca@luca-barbieri.com>2010-09-22 19:44:58 +0200
commitab5e9a726d50b414718a248fd8625f1c6f269a49 (patch)
tree94c5f8f2567546944d2017523a5b0ede58d5edc2 /src/gallium/state_trackers
parent3d4a15dfab04dbdce3ee2c7b182b076ed5eb757a (diff)
d3d1x: define GUIDs in the normal way
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h14
-rwxr-xr-xsrc/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp1
-rwxr-xr-xsrc/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp1
3 files changed, 0 insertions, 16 deletions
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h b/src/gallium/state_trackers/d3d1x/d3d1xstutil/include/d3d1xstutil.h
index 83cf0f2c3e..7627720148 100644
--- 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 ddba68518a..0fcef0d7b6 100755
--- a/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
+++ b/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
@@ -24,7 +24,6 @@
*
**************************************************************************/
-#define INITGUID
#include "d3d10app.h"
#include <X11/Xlib.h>
#include <GL/glx.h>
diff --git a/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp b/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
index 7e1edeb635..7055da941b 100755
--- 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
#include "d3d11app.h"
#include <X11/Xlib.h>
#include <GL/glx.h>