graw: Remove graw-null.

Pointless now that the graw tests can be built independently of any graw
implementation.

diff --git a/SConstruct b/SConstruct
index bb03e5055eadf1d73407c8d539cf78aaa2f08fc3..14663727f52539f19fd1d4c8f7c9acf9298c6d7e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -31,7 +31,7 @@ import common
 # Configuration options
 
 default_statetrackers = 'mesa'
-default_targets = 'graw-null'
+default_targets = 'none'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
        default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe'
@@ -69,7 +69,6 @@ opts.Add(ListVariable('targets', 'driver targets to build', default_targets,
                       'egl-swrast',
                       'egl-vmwgfx',
                       'graw-xlib',
-                      'graw-null',
                       'libgl-gdi',
                       'libgl-xlib',
                       'xorg-i915',

diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript
index e447d093610d2727341dc95659a408fb603a2e4d..7eecdb24c799d4512a20d942eb72a5aa6962e5e7 100644 (file)
--- a/src/gallium/targets/SConscript
+++ b/src/gallium/targets/SConscript
@@ -9,11 +9,6 @@ if 'mesa' in env['statetrackers']:
     if 'gdi' in env['winsys'] and 'libgl-gdi' not in env['targets']:
         env['targets'].append('libgl-gdi')
 
-if not 'graw-xlib' in env['targets'] and not 'graw-null' in env['targets'] and not env['msvc']:
-        # XXX: disable until MSVC can link correctly
-        SConscript('graw-null/SConscript')
-
-
 if env['dri']:
        SConscript([
                'SConscript.dri'

diff --git a/src/gallium/targets/graw-null/SConscript b/src/gallium/targets/graw-null/SConscript
deleted file mode 100644 (file)
index 3416989..0000000
--- a/src/gallium/targets/graw-null/SConscript
+++ /dev/null
@@ -1,58 +0,0 @@
-#######################################################################
-# SConscript for xlib winsys
-
-Import('*')
-
-env = env.Clone()
-
-env.Prepend(LIBS = [
-    ws_null,
-    trace,
-    rbug,
-    identity,
-#    gallium,
-])
-
-env.Append(CPPPATH = [
-    '#src/gallium/drivers',
-])
-
-if env['platform'] == 'windows':
-    # For trace
-    env.Append(LIBS = [
-        'ws2_32',
-    ])
-
-sources = [
-    'graw_null.c',
-    '../graw-xlib/graw_util.c',
-]
-
-if True:
-    env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
-    env.Prepend(LIBS = [softpipe])
-
-if env['llvm']:
-    env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
-    env.Tool('udis86')
-    env.Prepend(LIBS = [llvmpipe])
-
-# Need this for trace, identity drivers referenced by
-# gallium_wrap_screen().
-#
-env.Prepend(LIBS = [gallium])
-
-# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
-graw = env.SharedLibrary(
-    target ='graw',
-    source = sources,
-)
-
-env.InstallSharedLibrary(graw, version=(1, 0))
-
-if env['platform'] == 'windows':
-    graw = env.FindIxes(graw, 'LIBPREFIX', 'LIBSUFFIX')
-else:
-    graw = env.FindIxes(graw, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-
-Export('graw')

diff --git a/src/gallium/targets/graw-null/graw_null.c b/src/gallium/targets/graw-null/graw_null.c
deleted file mode 100644 (file)
index 5939a5a..0000000
--- a/src/gallium/targets/graw-null/graw_null.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "pipe/p_compiler.h"
-#include "util/u_debug.h"
-#include "util/u_memory.h"
-#include "target-helpers/wrap_screen.h"
-#include "sw/null/null_sw_winsys.h"
-#include "os/os_time.h"
-#include "state_tracker/graw.h"
-
-#ifdef GALLIUM_SOFTPIPE
-#include "softpipe/sp_public.h"
-#endif
-
-#ifdef GALLIUM_LLVMPIPE
-#include "llvmpipe/lp_public.h"
-#endif
-
-/* Haven't figured out a decent way to build the helper code yet -
- * #include it here temporarily.
- */
-#include "sw/sw_public.h"
-#include "sw/sw.c"
-
-#include <stdio.h>
-
-
-static struct {
-   void (*draw)(void);
-} graw;
-
-
-
-struct pipe_screen *
-graw_create_window_and_screen( int x,
-                               int y,
-                               unsigned width,
-                               unsigned height,
-                               enum pipe_format format,
-                               void **handle)
-{
-   const char *default_driver;
-   const char *driver;
-   struct pipe_screen *screen = NULL;
-   struct sw_winsys *winsys = NULL;
-   static int dummy;
-
-
-   /* Create the underlying winsys, which performs presents to Xlib
-    * drawables:
-    */
-   winsys = null_sw_create();
-   if (winsys == NULL)
-      return NULL;
-
-#if 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_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
-
-   *handle = &dummy;
-
-   /* Inject any wrapping layers we want to here:
-    */
-   return gallium_wrap_screen( screen );
-}
-
-
-
-void 
-graw_set_display_func( void (*draw)( void ) )
-{
-   graw.draw = draw;
-}
-
-
-void
-graw_main_loop( void )
-{
-   graw.draw();
-   os_time_sleep(100000);
-}