gallium-intel: Enable trace driver

diff --git a/src/gallium/winsys/drm/intel/dri/Makefile b/src/gallium/winsys/drm/intel/dri/Makefile
index ac0891a..de39e75 100644 (file)
--- a/src/gallium/winsys/drm/intel/dri/Makefile
+++ b/src/gallium/winsys/drm/intel/dri/Makefile
@@ -6,6 +6,7 @@ LIBNAME = i915_dri.so
 PIPE_DRIVERS = \
        $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
        $(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
+       $(TOP)/src/gallium/drivers/trace/libtrace.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/i915simple/libi915simple.a
 

diff --git a/src/gallium/winsys/drm/intel/dri/SConscript b/src/gallium/winsys/drm/intel/dri/SConscript
index b11a192..e14e96e 100644 (file)
--- a/src/gallium/winsys/drm/intel/dri/SConscript
+++ b/src/gallium/winsys/drm/intel/dri/SConscript
@@ -5,6 +5,7 @@ env = drienv.Clone()
 drivers = [
     softpipe,
     i915simple,
+    trace,
     inteldrm
 ]
 

diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_api.c b/src/gallium/winsys/drm/intel/gem/intel_be_api.c
index f4ef7c2..5853afa 100644 (file)
--- a/src/gallium/winsys/drm/intel/gem/intel_be_api.c
+++ b/src/gallium/winsys/drm/intel/gem/intel_be_api.c
@@ -2,7 +2,11 @@
 #include "intel_be_api.h"
 #include "i915simple/i915_winsys.h"
 
+#ifndef DEBUG
 struct drm_api drm_api_hooks =
+#else
+static struct drm_api hooks =
+#endif
 {
        /* intel_be_context.c */
        .create_context = intel_be_create_context,
@@ -13,3 +17,144 @@ struct drm_api drm_api_hooks =
        .handle_from_buffer = intel_be_handle_from_buffer,
        .global_handle_from_buffer = intel_be_global_handle_from_buffer,
 };
+
+
+/*
+ * Trace integration
+ */
+
+#ifdef DEBUG
+#include "trace/tr_screen.h"
+#include "trace/tr_texture.h"
+#include "trace/tr_buffer.h"
+#include "trace/tr_context.h"
+
+static struct pipe_screen *
+trace_drm_create_screen(int fd, struct drm_create_screen_arg *arg)
+{
+       struct pipe_screen *screen;
+
+       if (arg && arg->mode != DRM_CREATE_NORMAL)
+               return NULL;
+
+       screen = hooks.create_screen(fd, arg);
+
+       return trace_screen_create(screen);
+};
+
+static struct pipe_context *
+trace_drm_create_context(struct pipe_screen *_screen)
+{
+       struct pipe_screen *screen;
+       struct pipe_context *pipe;
+
+       if (trace_enabled())
+               screen = trace_screen(_screen)->screen;
+       else
+               screen = _screen;
+
+       pipe = hooks.create_context(screen);
+
+       if (trace_enabled())
+               pipe = trace_context_create(_screen, pipe);
+
+       return pipe;
+};
+
+static boolean
+trace_drm_buffer_from_texture(struct pipe_texture *_texture,
+                              struct pipe_buffer **_buffer,
+                              unsigned *stride)
+{
+       struct pipe_texture *texture;
+       struct pipe_buffer *buffer = NULL;
+       boolean result;
+
+       if (trace_enabled())
+               texture = trace_texture(_texture)->texture;
+       else
+               texture = _texture;
+
+       result = hooks.buffer_from_texture(texture, &buffer, stride);
+
+       if (result && _buffer)
+               buffer = trace_buffer_create(trace_screen(texture->screen), buffer);
+
+       if (_buffer)
+               *_buffer = buffer;
+       else
+               pipe_buffer_reference(&buffer, NULL);
+
+       return result;
+}
+
+static struct pipe_buffer *
+trace_drm_buffer_from_handle(struct pipe_screen *_screen,
+                             const char *name,
+                             unsigned handle)
+{
+       struct pipe_screen *screen;
+       struct pipe_buffer *result;
+
+       if (trace_enabled())
+               screen = trace_screen(_screen)->screen;
+       else
+               screen = _screen;
+
+       result = hooks.buffer_from_handle(screen, name, handle);
+
+       if (trace_enabled())
+               result = trace_buffer_create(trace_screen(_screen), result);
+
+       return result;
+}
+
+static boolean
+trace_drm_handle_from_buffer(struct pipe_screen *_screen,
+                             struct pipe_buffer *_buffer,
+                             unsigned *handle)
+{
+       struct pipe_screen *screen;
+       struct pipe_buffer *buffer;
+
+       if (trace_enabled()) {
+               screen = trace_screen(_screen)->screen;
+               buffer = trace_buffer(_buffer)->buffer;
+       } else {
+               screen = _screen;
+               buffer = _buffer;
+       }
+
+       return hooks.handle_from_buffer(screen, buffer, handle);
+}
+
+static boolean
+trace_drm_global_handle_from_buffer(struct pipe_screen *_screen,
+                                    struct pipe_buffer *_buffer,
+                                    unsigned *handle)
+{
+       struct pipe_screen *screen;
+       struct pipe_buffer *buffer;
+
+       if (trace_enabled()) {
+               screen = trace_screen(_screen)->screen;
+               buffer = trace_buffer(_buffer)->buffer;
+       } else {
+               screen = _screen;
+               buffer = _buffer;
+       }
+
+       return hooks.global_handle_from_buffer(screen, buffer, handle);
+}
+
+struct drm_api drm_api_hooks =
+{
+       .create_screen = trace_drm_create_screen,
+       .create_context = trace_drm_create_context,
+
+       .buffer_from_texture = trace_drm_buffer_from_texture,
+       .buffer_from_handle = trace_drm_buffer_from_handle,
+       .handle_from_buffer = trace_drm_handle_from_buffer,
+       .global_handle_from_buffer = trace_drm_global_handle_from_buffer,
+};
+#endif