summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/linux-cell2
-rw-r--r--src/gallium/drivers/cell/ppu/Makefile3
-rw-r--r--src/gallium/winsys/xlib/xlib_brw_context.c4
-rw-r--r--src/gallium/winsys/xlib/xlib_brw_screen.c4
-rw-r--r--src/gallium/winsys/xlib/xlib_softpipe.c2
5 files changed, 11 insertions, 4 deletions
diff --git a/configs/linux-cell b/configs/linux-cell
index 3322f114ba..115604ad65 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -6,7 +6,7 @@ CONFIG_NAME = linux-cell
# Omiting other gallium drivers:
-GALLIUM_DRIVER_DIRS = cell softpipe
+GALLIUM_DRIVER_DIRS = cell softpipe trace
# Compiler and flags
diff --git a/src/gallium/drivers/cell/ppu/Makefile b/src/gallium/drivers/cell/ppu/Makefile
index 9358a47284..12d7ef9a37 100644
--- a/src/gallium/drivers/cell/ppu/Makefile
+++ b/src/gallium/drivers/cell/ppu/Makefile
@@ -39,8 +39,7 @@ SOURCES = \
cell_texture.c \
cell_vbuf.c \
cell_vertex_fetch.c \
- cell_vertex_shader.c \
- cell_winsys.c
+ cell_vertex_shader.c
OBJECTS = $(SOURCES:.c=.o) \
diff --git a/src/gallium/winsys/xlib/xlib_brw_context.c b/src/gallium/winsys/xlib/xlib_brw_context.c
index a2bac0cc93..528473925a 100644
--- a/src/gallium/winsys/xlib/xlib_brw_context.c
+++ b/src/gallium/winsys/xlib/xlib_brw_context.c
@@ -199,7 +199,11 @@ xlib_create_brw_context( struct pipe_screen *screen,
/* Create the i965simple context:
*/
+#ifdef GALLIUM_CELL
+ return NULL;
+#else
return brw_create( screen,
&xbcws->brw_context_winsys,
0 );
+#endif
}
diff --git a/src/gallium/winsys/xlib/xlib_brw_screen.c b/src/gallium/winsys/xlib/xlib_brw_screen.c
index b0c7977185..9325bdc7a6 100644
--- a/src/gallium/winsys/xlib/xlib_brw_screen.c
+++ b/src/gallium/winsys/xlib/xlib_brw_screen.c
@@ -352,7 +352,11 @@ xlib_create_brw_winsys( void )
struct pipe_screen *
xlib_create_brw_screen( struct pipe_winsys *winsys )
{
+#ifdef GALLIUM_CELL
+ return NULL;
+#else
return brw_create_screen(winsys, 0/* XXX pci_id */);
+#endif
}
diff --git a/src/gallium/winsys/xlib/xlib_softpipe.c b/src/gallium/winsys/xlib/xlib_softpipe.c
index e4aa2d4b6a..79722dd72b 100644
--- a/src/gallium/winsys/xlib/xlib_softpipe.c
+++ b/src/gallium/winsys/xlib/xlib_softpipe.c
@@ -708,7 +708,7 @@ xlib_create_cell_winsys( void )
struct pipe_screen *
xlib_create_cell_screen( struct pipe_winsys *pws )
{
- return xlib_create_softpipe_screen( pws );
+ return cell_create_screen( pws );
}