George,
This is basically a reproduction of a facility I had in target-helpers
previously (swrast_screen.c or similar), which I removed after
feedback from Jose that supporting it with scons created more ugliness
than we saved in the C code.
This change breaks layering in the build system by making code in the
utility libraries conditionally built depending on which targets we're
supporting. Ideally the code in auxilliary wouldn't have any idea
whether softpipe, llvmpipe or any other driver is out there.
For the meantime, I'd say just duplicate the function in the few
places which use it. There aren't many currently. Longer term, I
think we probably want a little targets/common or similar, rather than
trying to bundle this into auxilliary.
Keith
On Sun, Mar 21, 2010 at 11:24 AM, George Sapountzis
gs...@kemper.freedesktop.org wrote:
Module: Mesa
Branch: master
Commit: f87a5f6499f51f651c2a9f2d4682875b22926905
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f87a5f6499f51f651c2a9f2d4682875b22926905
Author: George Sapountzis gsapount...@gmail.com
Date: Fri Mar 19 02:38:11 2010 +0200
gallium: add soft screen helper
---
src/gallium/auxiliary/target-helpers/soft_screen.c | 73
src/gallium/auxiliary/target-helpers/soft_screen.h | 12 +++
src/gallium/targets/libgl-xlib/Makefile | 1 +
src/gallium/targets/libgl-xlib/soft_screen.c | 1 +
src/gallium/targets/libgl-xlib/xlib.c | 34 +-
src/gallium/winsys/drm/sw/Makefile | 3 +-
src/gallium/winsys/drm/sw/soft_screen.c | 1 +
src/gallium/winsys/drm/sw/sw_drm_api.c | 32 -
8 files changed, 120 insertions(+), 37 deletions(-)
diff --git a/src/gallium/auxiliary/target-helpers/soft_screen.c
b/src/gallium/auxiliary/target-helpers/soft_screen.c
new file mode 100644
index 000..00d386e
--- /dev/null
+++ b/src/gallium/auxiliary/target-helpers/soft_screen.c
@@ -0,0 +1,73 @@
+/**
+ *
+ * Copyright 2010 VMware, Inc.
+ * 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.
+ *
+ *
+ **/
+
+#include target-helpers/soft_screen.h
+#include softpipe/sp_public.h
+#include llvmpipe/lp_public.h
+#include cell/ppu/cell_public.h
+#include util/u_debug.h
+
+/**
+ * Choose and create a software renderer screen.
+ */
+struct pipe_screen *
+gallium_soft_create_screen( struct sw_winsys *winsys )
+{
+ const char *default_driver = NULL;
+ const char *driver = NULL;
+ struct pipe_screen *screen = NULL;
+
+#if defined(GALLIUM_CELL)
+ default_driver = cell;
+#elif defined(GALLIUM_LLVMPIPE)
+ default_driver = llvmpipe;
+#elif defined(GALLIUM_SOFTPIPE)
+ default_driver = softpipe;
+#else
+ default_driver = ;
+#endif
+
+ driver = debug_get_option(GALLIUM_DRIVER, default_driver);
+
+#if defined(GALLIUM_CELL)
+ if (screen == NULL strcmp(driver, cell) == 0)
+ screen = cell_create_screen( winsys );
+#endif
+
+#if defined(GALLIUM_LLVMPIPE)
+ if (screen == NULL strcmp(driver, llvmpipe) == 0)
+ screen = llvmpipe_create_screen( winsys );
+#endif
+
+#if defined(GALLIUM_SOFTPIPE)
+ if (screen == NULL)
+ screen = softpipe_create_screen( winsys );
+#endif
+
+ return screen;
+}
diff --git a/src/gallium/auxiliary/target-helpers/soft_screen.h
b/src/gallium/auxiliary/target-helpers/soft_screen.h
new file mode 100644
index 000..5c10126
--- /dev/null
+++ b/src/gallium/auxiliary/target-helpers/soft_screen.h
@@ -0,0 +1,12 @@
+#ifndef SOFT_SCREEN_HELPER_H
+#define SOFT_SCREEN_HELPER_H
+
+#include pipe/p_compiler.h
+
+struct pipe_screen;
+struct sw_winsys;
+
+struct
