summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/drm/intel
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2009-05-16 10:03:46 -0700
committerCorbin Simpson <[email protected]>2009-05-16 10:07:58 -0700
commit0e8c6e56e467864249dfa311be1eef4dfc381f2a (patch)
tree8fb44350056ed36b5b439c656cce61b3037b9d6b /src/gallium/winsys/drm/intel
parent5e39a8c4503596a019dc7c3ed4e24ee4117b1fca (diff)
intel-gallium: Fix trace_drm integration.
Compile-tested only, sorry.
Diffstat (limited to 'src/gallium/winsys/drm/intel')
-rw-r--r--src/gallium/winsys/drm/intel/gem/intel_be_api.c149
1 files changed, 5 insertions, 144 deletions
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 5853afa7566..a74be13bf7a 100644
--- a/src/gallium/winsys/drm/intel/gem/intel_be_api.c
+++ b/src/gallium/winsys/drm/intel/gem/intel_be_api.c
@@ -2,10 +2,12 @@
#include "intel_be_api.h"
#include "i915simple/i915_winsys.h"
-#ifndef DEBUG
-struct drm_api drm_api_hooks =
+#ifdef DEBUG
+#include "trace/trace_drm.h"
+
+struct drm_api hooks =
#else
-static struct drm_api hooks =
+struct drm_api drm_api_hooks =
#endif
{
/* intel_be_context.c */
@@ -17,144 +19,3 @@ static struct 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