Changeset 39160 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/common

Timestamp:

Nov 1, 2011 2:35:23 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74625

Message:

wddm: better logging

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/common

Files:

• VBoxVideoLog.h (modified) (3 diffs)
• wddm/VBoxMPIf.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/VBoxVideoLog.h

@@ -24 +24 @@
 #endif
 
+#ifndef VBOX_VIDEO_LOG_LOGGER
+# define VBOX_VIDEO_LOG_LOGGER Log
+#endif
+
+#ifndef VBOX_VIDEO_LOGREL_LOGGER
+# define VBOX_VIDEO_LOGREL_LOGGER LogRel
+#endif
+
+#ifndef VBOX_VIDEO_LOGFLOW_LOGGER
+# define VBOX_VIDEO_LOGFLOW_LOGGER LogFlow
+#endif
+
+#ifndef VBOX_VIDEO_LOG_FN_FMT
+# define VBOX_VIDEO_LOG_FN_FMT LOG_FN_FMT
+#endif
+
 /* Uncomment to show file/line info in the log */
 /*#define VBOX_VIDEO_LOG_SHOWLINEINFO*/
 
-#define VBOX_VIDEO_LOG_PREFIX_FMT VBOX_VIDEO_LOG_NAME"::"LOG_FN_FMT": "
+#define VBOX_VIDEO_LOG_PREFIX_FMT VBOX_VIDEO_LOG_NAME"::"VBOX_VIDEO_LOG_FN_FMT": "
 #define VBOX_VIDEO_LOG_PREFIX_PARMS __PRETTY_FUNCTION__
 
@@ -68 +84 @@
 
 #ifdef VBOX_WDDM_MINIPORT
-# define _WARN_LOGGER LogRel
+# define _WARN_LOGGER VBOX_VIDEO_LOGREL_LOGGER
 #else
-# define _WARN_LOGGER Log
+# define _WARN_LOGGER VBOX_VIDEO_LOG_LOGGER
 #endif
 
@@ -94 +110 @@
     } while (0)
 
-#define LOG(_a) _LOGMSG(Log, _a)
-#define LOGREL(_a) _LOGMSG(LogRel, _a)
-#define LOGF(_a) _LOGMSG(LogFlow, _a)
+#define LOG(_a) _LOGMSG(VBOX_VIDEO_LOG_LOGGER, _a)
+#define LOGREL(_a) _LOGMSG(VBOX_VIDEO_LOGREL_LOGGER, _a)
+#define LOGF(_a) _LOGMSG(VBOX_VIDEO_LOGFLOW_LOGGER, _a)
 #define LOGF_ENTER() LOGF(("ENTER"))
 #define LOGF_LEAVE() LOGF(("LEAVE"))
-#define LOG_EXACT(_a) _LOGMSG_EXACT(Log, _a)
-#define LOGREL_EXACT(_a) _LOGMSG_EXACT(LogRel, _a)
+#define LOG_EXACT(_a) _LOGMSG_EXACT(VBOX_VIDEO_LOG_LOGGER, _a)
+#define LOGREL_EXACT(_a) _LOGMSG_EXACT(VBOX_VIDEO_LOGREL_LOGGER, _a)
+#define LOGF_EXACT(_a) _LOGMSG_EXACT(VBOX_VIDEO_LOGFLOW_LOGGER, _a)
 /* we can not print paged strings to RT logger, do it this way */
 #define LOG_STRA(_a) do {\
-        _LOGMSG_STR(Log, _a, "c"); \
+        _LOGMSG_STR(VBOX_VIDEO_LOG_LOGGER, _a, "c"); \
     } while (0)
 #define LOG_STRW(_a) do {\
-        _LOGMSG_STR(Log, _a, "c"); \
+        _LOGMSG_STR(VBOX_VIDEO_LOG_LOGGER, _a, "c"); \
     } while (0)
 #define LOGREL_STRA(_a) do {\
-        _LOGMSG_STR(LogRel, _a, "c"); \
+        _LOGMSG_STR(VBOX_VIDEO_LOGREL_LOGGER, _a, "c"); \
     } while (0)
 #define LOGREL_STRW(_a) do {\
-        _LOGMSG_STR(LogRel, _a, "c"); \
+        _LOGMSG_STR(VBOX_VIDEO_LOGREL_LOGGER, _a, "c"); \
     } while (0)
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -370 +370 @@
 } VBOXDISPIFESCAPE_DBGPRINT, *PVBOXDISPIFESCAPE_DBGPRINT;
 AssertCompile(RT_OFFSETOF(VBOXDISPIFESCAPE_DBGPRINT, EscapeHdr) == 0);
+
+typedef enum
+{
+    VBOXDISPIFESCAPE_DBGDUMPBUF_TYPE_UNDEFINED = 0,
+    VBOXDISPIFESCAPE_DBGDUMPBUF_TYPE_D3DCAPS9 = 1,
+    VBOXDISPIFESCAPE_DBGDUMPBUF_TYPE_DUMMY32BIT = 0x7fffffff
+} VBOXDISPIFESCAPE_DBGDUMPBUF_TYPE;
+
+typedef struct VBOXDISPIFESCAPE_DBGDUMPBUF_FLAGS
+{
+    union
+    {
+        struct
+        {
+            UINT WoW64      : 1;
+            UINT Reserved   : 31; /* reserved */
+        };
+        UINT  Value;
+    };
+} VBOXDISPIFESCAPE_DBGDUMPBUF_FLAGS, *PVBOXDISPIFESCAPE_DBGDUMPBUF_FLAGS;
+
+typedef struct VBOXDISPIFESCAPE_DBGDUMPBUF
+{
+    VBOXDISPIFESCAPE EscapeHdr;
+    VBOXDISPIFESCAPE_DBGDUMPBUF_TYPE enmType;
+    VBOXDISPIFESCAPE_DBGDUMPBUF_FLAGS Flags;
+    char aBuf[1];
+} VBOXDISPIFESCAPE_DBGDUMPBUF, *PVBOXDISPIFESCAPE_DBGDUMPBUF;
+AssertCompile(RT_OFFSETOF(VBOXDISPIFESCAPE_DBGDUMPBUF, EscapeHdr) == 0);
 
 typedef struct VBOXSCREENLAYOUT_ELEMENT