r300g: kill the X.Org state tracker target
This won't ever be made default and we don't need it anyway. We should also consider doing this for other drivers.
This commit is contained in:
Marek Olšák
parent
6acef6c5f7
commit
4d6faf5175
|
|
@ -1830,7 +1830,7 @@ if test "x$with_gallium_drivers" != x; then
|
|||
PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
|
||||
gallium_require_llvm "Gallium R300"
|
||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
|
||||
gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300"
|
||||
gallium_check_st "radeon/drm" "dri-r300" "" "" "xvmc-r300" "vdpau-r300"
|
||||
;;
|
||||
xr600)
|
||||
HAVE_GALLIUM_R600=yes
|
||||
|
|
@ -2057,7 +2057,6 @@ AC_CONFIG_FILES([Makefile
|
|||
src/gallium/targets/xa-vmwgfx/xatracker.pc
|
||||
src/gallium/targets/xorg-i915/Makefile
|
||||
src/gallium/targets/xorg-nouveau/Makefile
|
||||
src/gallium/targets/xorg-r300/Makefile
|
||||
src/gallium/targets/xorg-r600/Makefile
|
||||
src/gallium/targets/xorg-radeonsi/Makefile
|
||||
src/gallium/targets/xvmc-nouveau/Makefile
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
# Copyright © 2012 Intel Corporation
|
||||
#
|
||||
# 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, sublicense,
|
||||
# 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
|
||||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
# HOLDERS 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.
|
||||
|
||||
include $(top_srcdir)/src/gallium/Automake.inc
|
||||
|
||||
AM_CFLAGS = \
|
||||
$(GALLIUM_CFLAGS) \
|
||||
$(PTHREAD_CFLAGS) \
|
||||
$(XORG_CFLAGS)
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/gallium/drivers \
|
||||
-I$(top_srcdir)/src/gallium/winsys \
|
||||
-DHAVE_CONFIG_H \
|
||||
-DGALLIUM_RBUG \
|
||||
-DGALLIUM_TRACE \
|
||||
-DGALLIUM_GALAHAD
|
||||
|
||||
xorgdir = $(XORG_DRIVER_INSTALL_DIR)
|
||||
xorg_LTLIBRARIES = r300_drv.la
|
||||
|
||||
nodist_EXTRA_r300_drv_la_SOURCES = dummy.cpp
|
||||
r300_drv_la_SOURCES = \
|
||||
target.c \
|
||||
xorg.c
|
||||
|
||||
r300_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
|
||||
|
||||
r300_drv_la_LIBADD = \
|
||||
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
|
||||
$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
|
||||
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
|
||||
$(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \
|
||||
$(top_builddir)/src/gallium/drivers/r300/libr300.la \
|
||||
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
|
||||
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
|
||||
$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
|
||||
$(GALLIUM_DRI_LIB_DEPS) \
|
||||
$(LIBDRM_XORG_LIBS) \
|
||||
$(LIBKMS_XORG_LIBS) \
|
||||
$(RADEON_LIBS)
|
||||
|
||||
if HAVE_MESA_LLVM
|
||||
AM_CFLAGS += $(LLVM_CFLAGS)
|
||||
r300_drv_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||
r300_drv_la_LIBADD += $(LLVM_LIBS)
|
||||
endif
|
||||
|
||||
# Provide compatibility with scripts for the old Mesa build system for
|
||||
# a while by putting a link to the driver into /lib of the build tree.
|
||||
all-local: r300_drv.la
|
||||
$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
|
||||
ln -f .libs/r300_drv.so $(top_builddir)/$(LIB_DIR)/gallium/r300_drv.so
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
|
||||
#include "target-helpers/inline_debug_helper.h"
|
||||
#include "state_tracker/drm_driver.h"
|
||||
#include "radeon/drm/radeon_drm_public.h"
|
||||
#include "r300/r300_public.h"
|
||||
|
||||
static struct pipe_screen *
|
||||
create_screen(int fd)
|
||||
{
|
||||
struct radeon_winsys *sws;
|
||||
struct pipe_screen *screen;
|
||||
|
||||
sws = radeon_drm_winsys_create(fd);
|
||||
if (!sws)
|
||||
return NULL;
|
||||
|
||||
screen = r300_screen_create(sws);
|
||||
if (!screen)
|
||||
return NULL;
|
||||
|
||||
screen = debug_screen_wrap(screen);
|
||||
|
||||
return screen;
|
||||
}
|
||||
|
||||
DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)
|
||||
|
|
@ -1,148 +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>
|
||||
* Author: Corbin Simpson <MostAwesomedude@gmail.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../state_trackers/xorg/xorg_winsys.h"
|
||||
|
||||
static void r300_xorg_identify(int flags);
|
||||
static Bool r300_xorg_pci_probe(DriverPtr driver,
|
||||
int entity_num,
|
||||
struct pci_device *device,
|
||||
intptr_t match_data);
|
||||
|
||||
static const struct pci_id_match r300_xorg_device_match[] = {
|
||||
{0x1002, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
|
||||
{0, 0, 0},
|
||||
};
|
||||
|
||||
static SymTabRec r300_xorg_chipsets[] = {
|
||||
{PCI_MATCH_ANY, "ATI R300 Graphics Chipset"},
|
||||
{-1, NULL}
|
||||
};
|
||||
|
||||
static PciChipsets r300_xorg_pci_devices[] = {
|
||||
{PCI_MATCH_ANY, PCI_MATCH_ANY, NULL},
|
||||
{-1, -1, NULL}
|
||||
};
|
||||
|
||||
static XF86ModuleVersionInfo r300_xorg_version = {
|
||||
"r300",
|
||||
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 r300_driver = {
|
||||
1,
|
||||
"r300",
|
||||
r300_xorg_identify,
|
||||
NULL,
|
||||
xorg_tracker_available_options,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
r300_xorg_device_match,
|
||||
r300_xorg_pci_probe
|
||||
};
|
||||
|
||||
static MODULESETUPPROTO(r300_xorg_setup);
|
||||
|
||||
_X_EXPORT XF86ModuleData r300ModuleData = {
|
||||
&r300_xorg_version,
|
||||
r300_xorg_setup,
|
||||
NULL
|
||||
};
|
||||
|
||||
/*
|
||||
* Xorg driver functions
|
||||
*/
|
||||
|
||||
static pointer
|
||||
r300_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(&r300_driver, 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
|
||||
r300_xorg_identify(int flags)
|
||||
{
|
||||
xf86PrintChipsets("r300", "Driver for Radeon Gallium with KMS",
|
||||
r300_xorg_chipsets);
|
||||
}
|
||||
|
||||
static Bool
|
||||
r300_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, r300_xorg_pci_devices,
|
||||
NULL, NULL, NULL, NULL, NULL);
|
||||
if (scrn != NULL) {
|
||||
scrn->driverVersion = 1;
|
||||
scrn->driverName = "r300";
|
||||
scrn->name = "r300";
|
||||
scrn->Probe = NULL;
|
||||
|
||||
entity = xf86GetEntityInfo(entity_num);
|
||||
|
||||
/* Use all the functions from the xorg tracker */
|
||||
xorg_tracker_set_functions(scrn);
|
||||
}
|
||||
return scrn != NULL;
|
||||
}
|
||||
Loading…
Reference in New Issue