summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-03-10 12:00:13 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-03-10 12:00:13 +0000
commit7b8641bbba995bc3fc299b1018720caa1e91cb9f (patch)
treeaf0d97dd4fb72a878b211400031aa66f61e94b40
parentfc08d13fdcfe637064e92f962b1704fde193e70b (diff)
python: More build fixes.
-rw-r--r--src/gallium/SConscript3
-rw-r--r--src/gallium/state_trackers/python/SConscript3
-rw-r--r--src/gallium/state_trackers/python/st_device.c5
-rw-r--r--src/gallium/winsys/SConscript4
4 files changed, 10 insertions, 5 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index ba541f9636..c833d83e65 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -7,6 +7,9 @@ SConscript('auxiliary/SConscript')
for driver in env['drivers']:
SConscript(os.path.join('drivers', driver, 'SConscript'))
+# Needed by some state trackers
+SConscript('winsys/null/SConscript')
+
SConscript('state_trackers/python/SConscript')
if platform != 'embedded':
SConscript('state_trackers/glx/xlib/SConscript')
diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript
index 8010f122b7..2b44c13737 100644
--- a/src/gallium/state_trackers/python/SConscript
+++ b/src/gallium/state_trackers/python/SConscript
@@ -38,8 +38,9 @@ if 'python' in env['statetrackers']:
]
env.Prepend(LIBS = [
+ ws_null,
trace,
- gallium
+ gallium,
])
if 'llvmpipe' in env['drivers']:
diff --git a/src/gallium/state_trackers/python/st_device.c b/src/gallium/state_trackers/python/st_device.c
index 3aeb6226d0..335e8e7f0d 100644
--- a/src/gallium/state_trackers/python/st_device.c
+++ b/src/gallium/state_trackers/python/st_device.c
@@ -34,6 +34,7 @@
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_simple_shaders.h"
+#include "trace/tr_public.h"
#include "st_device.h"
#include "st_winsys.h"
@@ -84,6 +85,10 @@ st_device_create(boolean hardware)
else
screen = st_software_screen_create();
+ screen = trace_screen_create(screen);
+ if (!screen)
+ goto no_screen;
+
st_dev = CALLOC_STRUCT(st_device);
if (!st_dev)
goto no_device;
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 4567d17447..30c3378dff 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -1,9 +1,5 @@
Import('*')
-SConscript([
- 'null/SConscript',
-])
-
if env['dri']:
SConscript([
'drm/SConscript',