gallium-intel: Enable trace driver
This commit is contained in:
parent
f04c38fa1f
commit
3259f52a92
|
@ -6,6 +6,7 @@ LIBNAME = i915_dri.so
|
||||||
PIPE_DRIVERS = \
|
PIPE_DRIVERS = \
|
||||||
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
|
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
|
||||||
$(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.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/softpipe/libsoftpipe.a \
|
||||||
$(TOP)/src/gallium/drivers/i915simple/libi915simple.a
|
$(TOP)/src/gallium/drivers/i915simple/libi915simple.a
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ env = drienv.Clone()
|
||||||
drivers = [
|
drivers = [
|
||||||
softpipe,
|
softpipe,
|
||||||
i915simple,
|
i915simple,
|
||||||
|
trace,
|
||||||
inteldrm
|
inteldrm
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,11 @@
|
||||||
#include "intel_be_api.h"
|
#include "intel_be_api.h"
|
||||||
#include "i915simple/i915_winsys.h"
|
#include "i915simple/i915_winsys.h"
|
||||||
|
|
||||||
|
#ifndef DEBUG
|
||||||
struct drm_api drm_api_hooks =
|
struct drm_api drm_api_hooks =
|
||||||
|
#else
|
||||||
|
static struct drm_api hooks =
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
/* intel_be_context.c */
|
/* intel_be_context.c */
|
||||||
.create_context = intel_be_create_context,
|
.create_context = intel_be_create_context,
|
||||||
|
@ -13,3 +17,144 @@ struct drm_api drm_api_hooks =
|
||||||
.handle_from_buffer = intel_be_handle_from_buffer,
|
.handle_from_buffer = intel_be_handle_from_buffer,
|
||||||
.global_handle_from_buffer = intel_be_global_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
|
||||||
|
|
Loading…
Reference in New Issue