diff options
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri-i965/Makefile | 33 | ||||
| -rw-r--r-- | src/gallium/targets/dri-i965/SConscript | 32 | ||||
| -rw-r--r-- | src/gallium/targets/dri-i965/target.c | 29 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile | 10 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/egl_pipe.c | 30 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/Makefile | 12 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/pipe_i965.c | 30 | ||||
| -rw-r--r-- | src/gallium/targets/xorg-i965/Makefile | 26 | ||||
| -rw-r--r-- | src/gallium/targets/xorg-i965/intel_target.c | 29 | ||||
| -rw-r--r-- | src/gallium/targets/xorg-i965/intel_xorg.c | 147 |
11 files changed, 1 insertions, 381 deletions
diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile deleted file mode 100644 index 9e75bfe0831..00000000000 --- a/src/gallium/targets/dri-i965/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = i965_dri.so - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ - $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \ - $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/drivers/galahad/libgalahad.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/i965/libi965.a - -C_SOURCES = \ - target.c \ - $(COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -DRIVER_DEFINES = \ - -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE - -ifeq ($(MESA_LLVM),1) -PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a -DRIVER_DEFINES += -DGALLIUM_LLVMPIPE -endif - -include ../Makefile.dri - -DRI_LIB_DEPS += -ldrm_intel - -symlinks: diff --git a/src/gallium/targets/dri-i965/SConscript b/src/gallium/targets/dri-i965/SConscript deleted file mode 100644 index 01a458db228..00000000000 --- a/src/gallium/targets/dri-i965/SConscript +++ /dev/null @@ -1,32 +0,0 @@ -Import('*') - -env = drienv.Clone() - -env.PkgUseModules('DRM_INTEL') - -env.Append(CPPDEFINES = [ - 'GALLIUM_SOFTPIPE', - 'GALLIUM_RBUG', - 'GALLIUM_TRACE' -]) - -env.Prepend(LIBS = [ - st_dri, - i965drm, - ws_wrapper, - i965, - trace, - rbug, - mesa, - glsl, - gallium, - COMMON_DRI_DRM_OBJECTS -]) - -module = env.LoadableModule( - target = 'i965_dri.so', - source = 'target.c', - SHLIBPREFIX = '', -) - -env.Alias('dri-i965', module) diff --git a/src/gallium/targets/dri-i965/target.c b/src/gallium/targets/dri-i965/target.c deleted file mode 100644 index 0434063f20f..00000000000 --- a/src/gallium/targets/dri-i965/target.c +++ /dev/null @@ -1,29 +0,0 @@ - -#include "target-helpers/inline_wrapper_sw_helper.h" -#include "target-helpers/inline_debug_helper.h" -#include "state_tracker/drm_driver.h" -#include "i965/drm/i965_drm_public.h" -#include "i965/brw_public.h" - -static struct pipe_screen * -create_screen(int fd) -{ - struct brw_winsys_screen *bws; - struct pipe_screen *screen; - - bws = i965_drm_winsys_screen_create(fd); - if (!bws) - return NULL; - - screen = brw_screen_create(bws); - if (!screen) - return NULL; - - screen = sw_screen_wrap(screen); - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("i915", "i965", create_screen, NULL) diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 17a578d43af..79a098af448 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -96,16 +96,6 @@ egl_LIBS += \ egl_SYS += -ldrm_intel endif -# i965 -ifneq ($(findstring i965/drm,$(GALLIUM_WINSYS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_I995=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \ - $(TOP)/src/gallium/drivers/i965/libi965.a \ - $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a -egl_SYS += -ldrm_intel -endif - # nouveau ifneq ($(findstring nouveau/drm,$(GALLIUM_WINSYS_DIRS)),) egl_CPPFLAGS += -D_EGL_PIPE_NOUVEAU=1 diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index a929d600349..e657e9f2ff5 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -90,12 +90,10 @@ if env['HAVE_DRM']: env.PkgUseModules('DRM') if env['HAVE_DRM_INTEL']: - env.Append(CPPDEFINES = ['_EGL_PIPE_I915', '_EGL_PIPE_I965']) + env.Append(CPPDEFINES = ['_EGL_PIPE_I915']) env.Prepend(LIBS = [ i915drm, i915, - i965drm, - i965, ws_wrapper, ]) diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c index f2b50bd0eab..887bcfd12c4 100644 --- a/src/gallium/targets/egl-static/egl_pipe.c +++ b/src/gallium/targets/egl-static/egl_pipe.c @@ -32,10 +32,7 @@ /* for i915 */ #include "i915/drm/i915_drm_public.h" #include "i915/i915_public.h" -/* for i965 */ #include "target-helpers/inline_wrapper_sw_helper.h" -#include "i965/drm/i965_drm_public.h" -#include "i965/brw_public.h" /* for nouveau */ #include "nouveau/drm/nouveau_drm_public.h" /* for r300 */ @@ -71,31 +68,6 @@ pipe_i915_create_screen(int fd) } static struct pipe_screen * -pipe_i965_create_screen(int fd) -{ -#if _EGL_PIPE_I965 - struct brw_winsys_screen *bws; - struct pipe_screen *screen; - - bws = i965_drm_winsys_screen_create(fd); - if (!bws) - return NULL; - - screen = brw_screen_create(bws); - if (!screen) - return NULL; - - screen = sw_screen_wrap(screen); - - screen = debug_screen_wrap(screen); - - return screen; -#else - return NULL; -#endif -} - -static struct pipe_screen * pipe_nouveau_create_screen(int fd) { #if _EGL_PIPE_NOUVEAU @@ -187,8 +159,6 @@ egl_pipe_create_drm_screen(const char *name, int fd) { if (strcmp(name, "i915") == 0) return pipe_i915_create_screen(fd); - else if (strcmp(name, "i965") == 0) - return pipe_i965_create_screen(fd); else if (strcmp(name, "nouveau") == 0) return pipe_nouveau_create_screen(fd); else if (strcmp(name, "r300") == 0) diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile index 15618a6f126..89fddfe9a7b 100644 --- a/src/gallium/targets/gbm/Makefile +++ b/src/gallium/targets/gbm/Makefile @@ -59,13 +59,6 @@ i915_LIBS = \ $(TOP)/src/gallium/drivers/i915/libi915.a i915_SYS = -ldrm_intel -# i965 pipe driver -i965_LIBS = \ - $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \ - $(TOP)/src/gallium/drivers/i965/libi965.a \ - $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a -i965_SYS = -ldrm_intel - # nouveau pipe driver nouveau_LIBS = \ $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \ @@ -112,11 +105,6 @@ _pipe_TARGETS_CC += $(PIPE_PREFIX)i915.so pipe_SOURCES += pipe_i915.c endif -ifneq ($(findstring i965/drm,$(GALLIUM_WINSYS_DIRS)),) -_pipe_TARGETS_CC += $(PIPE_PREFIX)i965.so -pipe_SOURCES += pipe_i965.c -endif - ifneq ($(findstring nouveau/drm,$(GALLIUM_WINSYS_DIRS)),) _pipe_TARGETS_CXX += $(PIPE_PREFIX)nouveau.so pipe_SOURCES += pipe_nouveau.c diff --git a/src/gallium/targets/gbm/pipe_i965.c b/src/gallium/targets/gbm/pipe_i965.c deleted file mode 100644 index 1eece9ce4b4..00000000000 --- a/src/gallium/targets/gbm/pipe_i965.c +++ /dev/null @@ -1,30 +0,0 @@ - -#include "target-helpers/inline_debug_helper.h" -#include "target-helpers/inline_wrapper_sw_helper.h" -#include "state_tracker/drm_driver.h" -#include "i965/drm/i965_drm_public.h" -#include "i965/brw_public.h" - -static struct pipe_screen * -create_screen(int fd) -{ - struct brw_winsys_screen *bws; - struct pipe_screen *screen; - - bws = i965_drm_winsys_screen_create(fd); - if (!bws) - return NULL; - - screen = brw_screen_create(bws); - if (!screen) - return NULL; - - screen = sw_screen_wrap(screen); - - screen = debug_screen_wrap(screen); - - return screen; -} - -PUBLIC -DRM_DRIVER_DESCRIPTOR("i965", "i965", create_screen, NULL) diff --git a/src/gallium/targets/xorg-i965/Makefile b/src/gallium/targets/xorg-i965/Makefile deleted file mode 100644 index 36df276cb71..00000000000 --- a/src/gallium/targets/xorg-i965/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = i965g_drv.so - -C_SOURCES = \ - intel_target.c \ - intel_xorg.c - -DRIVER_DEFINES = \ - -DHAVE_CONFIG_H -DGALLIUM_SOFTPIPE \ - -DGALLIUM_RBUG -DGALLIUM_TRACE - -DRIVER_PIPES = \ - $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \ - $(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \ - $(TOP)/src/gallium/drivers/i965/libi965.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a - -DRIVER_LINKS = \ - $(shell $(PKG_CONFIG) --libs libdrm libdrm_intel) - -include ../Makefile.xorg diff --git a/src/gallium/targets/xorg-i965/intel_target.c b/src/gallium/targets/xorg-i965/intel_target.c deleted file mode 100644 index 0434063f20f..00000000000 --- a/src/gallium/targets/xorg-i965/intel_target.c +++ /dev/null @@ -1,29 +0,0 @@ - -#include "target-helpers/inline_wrapper_sw_helper.h" -#include "target-helpers/inline_debug_helper.h" -#include "state_tracker/drm_driver.h" -#include "i965/drm/i965_drm_public.h" -#include "i965/brw_public.h" - -static struct pipe_screen * -create_screen(int fd) -{ - struct brw_winsys_screen *bws; - struct pipe_screen *screen; - - bws = i965_drm_winsys_screen_create(fd); - if (!bws) - return NULL; - - screen = brw_screen_create(bws); - if (!screen) - return NULL; - - screen = sw_screen_wrap(screen); - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("i915", "i965", create_screen, NULL) diff --git a/src/gallium/targets/xorg-i965/intel_xorg.c b/src/gallium/targets/xorg-i965/intel_xorg.c deleted file mode 100644 index f4608f0eb41..00000000000 --- a/src/gallium/targets/xorg-i965/intel_xorg.c +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas. - * 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 above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * 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 TUNGSTEN GRAPHICS 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. - * - * - * Author: Alan Hourihane <alanh@tungstengraphics.com> - * Author: Jakob Bornecrantz <wallbraker@gmail.com> - * - */ - -#include "../../state_trackers/xorg/xorg_winsys.h" - -static void intel_xorg_identify(int flags); -static Bool intel_xorg_pci_probe(DriverPtr driver, - int entity_num, - struct pci_device *device, - intptr_t match_data); - -static const struct pci_id_match intel_xorg_device_match[] = { - {0x8086, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0}, - {0, 0, 0}, -}; - -static SymTabRec intel_xorg_chipsets[] = { - {PCI_MATCH_ANY, "Intel Graphics Device"}, - {-1, NULL} -}; - -static PciChipsets intel_xorg_pci_devices[] = { - {PCI_MATCH_ANY, PCI_MATCH_ANY, NULL}, - {-1, -1, NULL} -}; - -static XF86ModuleVersionInfo intel_xorg_version = { - "modesetting", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 0, 1, 0, /* major, minor, patch */ - ABI_CLASS_VIDEODRV, - ABI_VIDEODRV_VERSION, - MOD_CLASS_VIDEODRV, - {0, 0, 0, 0} -}; - -/* - * Xorg driver exported structures - */ - -_X_EXPORT DriverRec modesetting = { - 1, - "modesetting", - intel_xorg_identify, - NULL, - xorg_tracker_available_options, - NULL, - 0, - NULL, - intel_xorg_device_match, - intel_xorg_pci_probe -}; - -static MODULESETUPPROTO(intel_xorg_setup); - -_X_EXPORT XF86ModuleData modesettingModuleData = { - &intel_xorg_version, - intel_xorg_setup, - NULL -}; - -/* - * Xorg driver functions - */ - -static pointer -intel_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin) -{ - static Bool setupDone = 0; - - /* This module should be loaded only once, but check to be sure. - */ - if (!setupDone) { - setupDone = 1; - xf86AddDriver(&modesetting, module, HaveDriverFuncs); - - /* - * The return value must be non-NULL on success even though there - * is no TearDownProc. - */ - return (pointer) 1; - } else { - if (errmaj) - *errmaj = LDR_ONCEONLY; - return NULL; - } -} - -static void -intel_xorg_identify(int flags) -{ - xf86PrintChipsets("modesetting", "Driver for Modesetting Kernel Drivers", - intel_xorg_chipsets); -} - -static Bool -intel_xorg_pci_probe(DriverPtr driver, - int entity_num, struct pci_device *device, intptr_t match_data) -{ - ScrnInfoPtr scrn = NULL; - EntityInfoPtr entity; - - scrn = xf86ConfigPciEntity(scrn, 0, entity_num, intel_xorg_pci_devices, - NULL, NULL, NULL, NULL, NULL); - if (scrn != NULL) { - scrn->driverVersion = 1; - scrn->driverName = "i965"; - scrn->name = "modesetting"; - scrn->Probe = NULL; - - entity = xf86GetEntityInfo(entity_num); - - /* Use all the functions from the xorg tracker */ - xorg_tracker_set_functions(scrn); - } - return scrn != NULL; -} |