projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch'
[mesa.git]
/
src
/
gallium
/
winsys
/
drm
/
radeon
/
core
/
radeon_drm.c
diff --git
a/src/gallium/winsys/drm/radeon/core/radeon_drm.c
b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
index 428d3f65a169be009d8e00395b84e162bec203f1..5406d2bbea06b2545be6ffb328196560c553fb25 100644
(file)
--- a/
src/gallium/winsys/drm/radeon/core/radeon_drm.c
+++ b/
src/gallium/winsys/drm/radeon/core/radeon_drm.c
@@
-30,6
+30,10
@@
#include "radeon_drm.h"
#include "radeon_drm.h"
+#ifdef DEBUG
+#include "trace/trace_drm.h"
+#endif
+
/* Create a pipe_screen. */
struct pipe_screen* radeon_create_screen(int drmFB,
struct drm_create_screen_arg *arg)
/* Create a pipe_screen. */
struct pipe_screen* radeon_create_screen(int drmFB,
struct drm_create_screen_arg *arg)
@@
-112,7
+116,11
@@
boolean radeon_global_handle_from_buffer(struct pipe_screen* screen,
return TRUE;
}
return TRUE;
}
+#ifdef DEBUG
+struct drm_api hooks = {
+#else
struct drm_api drm_api_hooks = {
struct drm_api drm_api_hooks = {
+#endif
.create_screen = radeon_create_screen,
.create_context = radeon_create_context,
/* XXX fix this */
.create_screen = radeon_create_screen,
.create_context = radeon_create_context,
/* XXX fix this */