projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
targets/libgl-xlib: add code to inject trace and identity layers
[mesa.git]
/
src
/
gallium
/
state_trackers
/
glx
/
xlib
/
xm_api.c
diff --git
a/src/gallium/state_trackers/glx/xlib/xm_api.c
b/src/gallium/state_trackers/glx/xlib/xm_api.c
index cf9a3992091981f615b95f5c976ff082329c712b..b8647d71c63925e5f87abbde9d332ee8b13b17cf 100644
(file)
--- a/
src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/
src/gallium/state_trackers/glx/xlib/xm_api.c
@@
-63,10
+63,6
@@
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
-#include "trace/tr_screen.h"
-#include "trace/tr_context.h"
-#include "trace/tr_texture.h"
-
#include "xm_winsys.h"
#include <GL/glx.h>
#include "xm_winsys.h"
#include <GL/glx.h>
@@
-87,7
+83,6
@@
void xmesa_set_driver( const struct xm_driver *templ )
*/
pipe_mutex _xmesa_lock;
*/
pipe_mutex _xmesa_lock;
-static struct pipe_screen *_screen = NULL;
static struct pipe_screen *screen = NULL;
static struct pipe_screen *screen = NULL;
@@
-709,8
+704,7
@@
xmesa_init( Display *display )
static GLboolean firstTime = GL_TRUE;
if (firstTime) {
pipe_mutex_init(_xmesa_lock);
static GLboolean firstTime = GL_TRUE;
if (firstTime) {
pipe_mutex_init(_xmesa_lock);
- _screen = driver.create_pipe_screen( display );
- screen = trace_screen_create( _screen );
+ screen = driver.create_pipe_screen( display );
firstTime = GL_FALSE;
}
}
firstTime = GL_FALSE;
}
}