diff options
4 files changed, 1 insertions, 103 deletions
diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp index b7dd6855dc0..1c08fb1ab27 100644 --- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp +++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp @@ -13,7 +13,6 @@ #include "GLView.h" #include "bitmap_wrapper.h" -#include "hgl_sw_winsys.h" extern "C" { #include "glapi/glapi.h" #include "main/context.h" @@ -26,6 +25,7 @@ extern "C" { #include "state_tracker/st_gl_api.h" #include "state_tracker/st_manager.h" #include "state_tracker/sw_winsys.h" +#include "hgl_sw_winsys.h" #ifdef HAVE_LLVM #include "llvmpipe/lp_public.h" #else diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript index 6e12dc437a8..bad5679a35c 100644 --- a/src/gallium/targets/haiku-softpipe/SConscript +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -29,7 +29,6 @@ if env['llvm']: env.Append(CPPDEFINES = 'HAVE_LLVMPIPE') softpipe_sources = [ - 'haiku-softpipe.c', 'GalliumContext.cpp', 'GalliumFramebuffer.cpp', 'SoftwareRenderer.cpp' diff --git a/src/gallium/targets/haiku-softpipe/haiku-softpipe.c b/src/gallium/targets/haiku-softpipe/haiku-softpipe.c deleted file mode 100644 index d0a427b3d12..00000000000 --- a/src/gallium/targets/haiku-softpipe/haiku-softpipe.c +++ /dev/null @@ -1,65 +0,0 @@ -/************************************************************************** - * - * 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 deleted file mode 100644 index 75bf6df4324..00000000000 --- a/src/gallium/targets/haiku-softpipe/haiku-softpipe.h +++ /dev/null @@ -1,36 +0,0 @@ -/************************************************************************** - * - * 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 |