Mesa (gallium-xlib-rework): cell: fix breakage from xlib re-org

Brian Paul brianp at kemper.freedesktop.org
Thu Jan 8 07:30:38 PST 2009


Module: Mesa
Branch: gallium-xlib-rework
Commit: a129c7268acc5a36852fcb006391e1f4b51ce7e1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a129c7268acc5a36852fcb006391e1f4b51ce7e1

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan  8 08:29:42 2009 -0700

cell: fix breakage from xlib re-org

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

---

 configs/linux-cell                         |    2 +-
 src/gallium/drivers/cell/ppu/Makefile      |    3 +--
 src/gallium/winsys/xlib/xlib_brw_context.c |    4 ++++
 src/gallium/winsys/xlib/xlib_brw_screen.c  |    4 ++++
 src/gallium/winsys/xlib/xlib_softpipe.c    |    2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configs/linux-cell b/configs/linux-cell
index 3322f11..115604a 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 9358a47..12d7ef9 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 a2bac0c..5284739 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 b0c7977..9325bdc 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 e4aa2d4..79722dd 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 );
 }
 
 



More information about the mesa-commit mailing list