cell: fix breakage from xlib re-org

Some of these fixes are quick band-aids for now.

diff --git a/configs/linux-cell b/configs/linux-cell
index 3322f114ba7a1c730929709cc9029516923b35b1..115604ad658246db750c18cf7935d0a533504493 100644 (file)
--- 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 9358a47284c63859424d2ae6889a84774d136612..12d7ef9a3700480d0a9e8c076492035c83e79750 100644 (file)
--- 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 a2bac0cc93b068ade7ebbabd76d71a9a6c33899f..528473925ada908b47f30638f24ce13c87f93043 100644 (file)
--- 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 b0c7977185eb20f3eb30492441ca837e1cc6e709..9325bdc7a6849edcc0b0df8265f27c19f69628a5 100644 (file)
--- 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 e4aa2d4b6aece93073a6f2c68303ff26044c6130..79722dd72b478749ae9d035a6f3b5aae4fa45440 100644 (file)
--- 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 );
 }