diff options
author | Alexander von Gluck IV <[email protected]> | 2013-05-21 15:55:24 -0500 |
---|---|---|
committer | Alexander von Gluck IV <[email protected]> | 2013-05-22 14:31:44 -0500 |
commit | 6d20e251f25b47c19a5fcd80d9aa30bf75367590 (patch) | |
tree | 8d6a8c6a80257c3623e7b95e2028cc408ea1bb7b /src/gallium/targets | |
parent | ff68f61bedc2d910b98af4ef4475373f4d3958a3 (diff) |
Haiku: Add Gallium winsys and target code
* We generate a static library for Haiku
Gallium targets as our port system combines
the compiled rendering code into a modular
ar for each module (for example, our port
system combines llvm libsoftpipe.a libllvmpipe.a
into a single ar for the Haiku build system.
I'd like the Gallium hgl target scons build
system to do this some day, however how is
beyond me at the moment. This is a first step.
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/haiku-softpipe/SConscript | 21 | ||||
-rw-r--r-- | src/gallium/targets/haiku-softpipe/haiku-softpipe.c | 65 | ||||
-rw-r--r-- | src/gallium/targets/haiku-softpipe/haiku-softpipe.h | 36 |
3 files changed, 122 insertions, 0 deletions
diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript new file mode 100644 index 00000000000..72a5ba79627 --- /dev/null +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -0,0 +1,21 @@ +Import('*') + +if True: + env.Append(CPPDEFINES = [ + 'GALLIUM_SOFTPIPE', + 'GALLIUM_RBUG', + 'GALLIUM_TRACE', + ]) + +if env['llvm']: + env.Append(CPPDEFINES = 'HAVE_LLVMPIPE') + +softpipe_sources = [ + 'haiku-softpipe.c' +] + +module = env.StaticLibrary( + target ='swpipe_haiku.a', + source = softpipe_sources, + SHLIBPREFIX = '', +) diff --git a/src/gallium/targets/haiku-softpipe/haiku-softpipe.c b/src/gallium/targets/haiku-softpipe/haiku-softpipe.c new file mode 100644 index 00000000000..d0a427b3d12 --- /dev/null +++ b/src/gallium/targets/haiku-softpipe/haiku-softpipe.c @@ -0,0 +1,65 @@ +/************************************************************************** + * + * Copyright 2013 Alexander von Gluck IV <[email protected]> + * + * 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 "haiku-softpipe.h" + +#include "util/u_debug.h" +#include "sw/hgl/hgl_sw_winsys.h" + +#include "softpipe/sp_texture.h" +#include "softpipe/sp_screen.h" +#include "softpipe/sp_public.h" + +#ifdef HAVE_LLVMPIPE +#include "llvmpipe/lp_texture.h" +#include "llvmpipe/lp_screen.h" +#include "llvmpipe/lp_public.h" +#endif + + +struct pipe_screen* +hgl_sw_screen_create(void) +{ + struct sw_winsys* winsys = hgl_create_sw_winsys(); + struct pipe_screen* screen = NULL; + + if (!winsys) + return NULL; + + #ifdef HAVE_LLVMPIPE + screen = llvmpipe_create_screen(winsys); + #else + screen = softpipe_create_screen(winsys); + #endif + + if (!screen) { + winsys->destroy(winsys); + return NULL; + } + + return screen; +} diff --git a/src/gallium/targets/haiku-softpipe/haiku-softpipe.h b/src/gallium/targets/haiku-softpipe/haiku-softpipe.h new file mode 100644 index 00000000000..75bf6df4324 --- /dev/null +++ b/src/gallium/targets/haiku-softpipe/haiku-softpipe.h @@ -0,0 +1,36 @@ +/************************************************************************** + * + * Copyright 2013 Alexander von Gluck IV <[email protected]> + * + * 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. + * + **************************************************************************/ +#ifndef HAIKU_SOFTPIPE_H_ +#define HAIKU_SOFTPIPE_H_ + + +#include "pipe/p_context.h" + + +struct pipe_screen* hgl_sw_screen_create(void); + + +#endif |