From: Keith Whitwell <keithw@vmware.com>
Date: Mon, 8 Mar 2010 19:21:27 +0000 (+0000)
Subject: gallium: make it work
X-Git-Tag: 062012170305~14085^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c867c58c7340eb5d56f7cc3edf95cce94600f858;p=profile%2Fivi%2Fmesa.git

gallium: make it work
---

diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 056b6a3..bb631b1 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -9,6 +9,7 @@ LIBRARY_INCLUDES = \
 	-I$(TOP)/src/gallium/auxiliary
 
 C_SOURCES = \
+	xlib.c \
 	xlib_cell.c \
 	xlib_sw_winsys.c \
 	xlib_llvmpipe.c \
diff --git a/src/gallium/winsys/xlib/xlib.c b/src/gallium/winsys/xlib/xlib.c
new file mode 100644
index 0000000..6ca9e36
--- /dev/null
+++ b/src/gallium/winsys/xlib/xlib.c
@@ -0,0 +1,49 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Bismarck, ND., USA
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * 
+ **************************************************************************/
+
+/*
+ * Authors:
+ *   Keith Whitwell
+ */
+
+#include "xlib.h"
+#include "util/u_debug.h"
+
+struct xm_driver *xlib_sw_winsys_init( void )
+{
+#if defined(GALLIUM_CELL)
+   if (!getenv("GALLIUM_NOCELL")) 
+      return &xlib_cell_driver;
+#endif
+
+#if defined(GALLIUM_LLVMPIPE)
+   return &xlib_llvmpipe_driver;
+#endif
+
+   return &xlib_softpipe_driver;
+}