3 files changed, 145 insertions, 14 deletions

diff --git a/src/gallium/drivers/trace/SConscript b/src/gallium/drivers/trace/SConscript
index a21ced9176a..5c49468c4eb 100644
--- a/src/gallium/drivers/trace/SConscript
+++ b/src/gallium/drivers/trace/SConscript
@@ -9,7 +9,8 @@ trace = env.ConvenienceLibrary(
         'tr_dump.c',
         'tr_screen.c',
         'tr_state.c',
-        'tr_stream.c',
+        'tr_stream_stdc.c',
+        'tr_stream_wd.c',
         'tr_texture.c',
         'tr_winsys.c',
     ])
diff --git a/src/gallium/drivers/trace/tr_stream.c b/src/gallium/drivers/trace/tr_stream_stdc.c
index d008dbac27b..4c77e1c995c 100644
--- a/src/gallium/drivers/trace/tr_stream.c
+++ b/src/gallium/drivers/trace/tr_stream_stdc.c
@@ -25,13 +25,16 @@
  *
  **************************************************************************/
 
+/**
+ * @file
+ * Stream implementation based on the Standard C Library.
+ */
+
 #include "pipe/p_config.h"
 
 #if defined(PIPE_OS_LINUX)
+
 #include <stdio.h>
-#else
-#error Unsupported platform 
-#endif
 
 #include "pipe/p_util.h"
 
@@ -40,9 +43,7 @@
 
 struct trace_stream 
 {
-#if defined(PIPE_OS_LINUX)
    FILE *file;
-#endif
 };
 
 
@@ -55,11 +56,9 @@ trace_stream_create(const char *filename)
    if(!stream)
       goto error1;
    
-#if defined(PIPE_OS_LINUX)
    stream->file = fopen(filename, "w");
    if(!stream->file)
       goto error2;
-#endif
    
    return stream;
    
@@ -76,9 +75,7 @@ trace_stream_write(struct trace_stream *stream, const void *data, size_t size)
    if(!stream)
       return FALSE;
    
-#if defined(PIPE_OS_LINUX)
    return fwrite(data, size, 1, stream->file) == size ? TRUE : FALSE;
-#endif
 }
 
 
@@ -88,9 +85,7 @@ trace_stream_flush(struct trace_stream *stream)
    if(!stream)
       return;
    
-#if defined(PIPE_OS_LINUX)
    fflush(stream->file);
-#endif
 }
 
 
@@ -100,9 +95,10 @@ trace_stream_close(struct trace_stream *stream)
    if(!stream)
       return;
    
-#if defined(PIPE_OS_LINUX)
    fclose(stream->file);
-#endif
 
    FREE(stream);
 }
+
+
+#endif
diff --git a/src/gallium/drivers/trace/tr_stream_wd.c b/src/gallium/drivers/trace/tr_stream_wd.c
new file mode 100644
index 00000000000..9a05c0cec89
--- /dev/null
+++ b/src/gallium/drivers/trace/tr_stream_wd.c
@@ -0,0 +1,134 @@
+/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+/**
+ * @file
+ * Stream implementation for the Windows Display driver.
+ */
+
+#include "pipe/p_config.h"
+
+#if defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY)
+
+#include <windows.h>
+#include <winddi.h>
+
+#include "pipe/p_util.h"
+
+#include "tr_stream.h"
+
+
+#define MAP_FILE_SIZE (4*1024*1024)
+
+
+struct trace_stream 
+{
+   WCHAR wFileName[MAX_PATH + 1];
+   ULONG_PTR iFile;
+   char *pMap;
+   size_t written;
+};
+
+
+struct trace_stream *
+trace_stream_create(const char *filename)
+{
+   struct trace_stream *stream;
+   ULONG BytesInUnicodeString;
+   
+   stream = CALLOC_STRUCT(trace_stream);
+   if(!stream)
+      goto error1;
+   
+   EngMultiByteToUnicodeN(
+         stream->wFileName,
+         sizeof(stream->wFileName),
+         &BytesInUnicodeString,
+         (char *)filename,
+         strlen(filename));
+   
+   stream->pMap = EngMapFile(stream->wFileName, MAP_FILE_SIZE, &stream->iFile);
+   if(!stream->pMap)
+      goto error2;
+   
+   return stream;
+   
+error2:
+   FREE(stream);
+error1:
+   return NULL;
+}
+
+
+boolean
+trace_stream_write(struct trace_stream *stream, const void *data, size_t size)
+{
+   boolean ret;
+   
+   if(!stream)
+      return FALSE;
+   
+   if(stream->written + size > MAP_FILE_SIZE) {
+      ret = FALSE;
+      size = MAP_FILE_SIZE - stream->written;
+   }
+   else
+      ret = TRUE;
+   
+   memcpy(stream->pMap + stream->written, data, size);
+   stream->written += size;
+   
+   return ret;
+}
+
+
+void
+trace_stream_flush(struct trace_stream *stream) 
+{
+   (void)stream;
+}
+
+
+void
+trace_stream_close(struct trace_stream *stream) 
+{
+   if(!stream)
+      return;
+   
+   EngUnmapFile(stream->iFile);
+   if(stream->written < MAP_FILE_SIZE) {
+      /* Truncate file size */
+      stream->pMap = EngMapFile(stream->wFileName, stream->written, &stream->iFile);
+      if(stream->pMap)
+         EngUnmapFile(stream->iFile);
+   }
+
+   FREE(stream);
+}
+
+
+#endif