targets/dri-i915: Convert to static/shared pipe-drivers
v2: - Drop inclusion of the winsys wrapper and softpipe/llvmpipe. - Remove old Makefile.am, target.c. - Correctly append i915 to the megadrivers list. Cc: Stephane Marchesin <stephane.marchesin@gmail.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Tested-by: Rob Clark <robclark@freedesktop.org> Tested-by: Thomas Helland <thomashelland90 at gmail.com> Acked-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Emil Velikov
parent
231063b032
commit
0a4be815f4
|
|
@ -1926,7 +1926,7 @@ if test -n "$with_gallium_drivers"; then
|
|||
PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
|
||||
gallium_require_drm_loader
|
||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
|
||||
gallium_check_st "i915/drm" "dri-i915" "xa/i915"
|
||||
gallium_check_st "i915/drm" "dri/i915" "xa/i915"
|
||||
;;
|
||||
xilo)
|
||||
HAVE_GALLIUM_ILO=yes
|
||||
|
|
@ -2208,7 +2208,6 @@ AC_CONFIG_FILES([Makefile
|
|||
src/gallium/state_trackers/xa/Makefile
|
||||
src/gallium/state_trackers/xvmc/Makefile
|
||||
src/gallium/targets/Makefile
|
||||
src/gallium/targets/dri-i915/Makefile
|
||||
src/gallium/targets/dri-ilo/Makefile
|
||||
src/gallium/targets/dri-swrast/Makefile
|
||||
src/gallium/targets/dri-vmwgfx/Makefile
|
||||
|
|
|
|||
|
|
@ -64,12 +64,6 @@ SUBDIRS += dri-vmwgfx
|
|||
endif
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_I915
|
||||
if HAVE_DRI2
|
||||
SUBDIRS += dri-i915
|
||||
endif
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_ILO
|
||||
if HAVE_DRI2
|
||||
SUBDIRS += dri-ilo
|
||||
|
|
|
|||
|
|
@ -1,51 +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_DRI_CFLAGS)
|
||||
AM_CPPFLAGS = \
|
||||
-DGALLIUM_RBUG \
|
||||
-DGALLIUM_TRACE \
|
||||
-DGALLIUM_GALAHAD
|
||||
|
||||
dridir = $(DRI_DRIVER_INSTALL_DIR)
|
||||
dri_LTLIBRARIES = i915_dri.la
|
||||
|
||||
nodist_EXTRA_i915_dri_la_SOURCES = dummy.cpp
|
||||
i915_dri_la_SOURCES = target.c
|
||||
|
||||
i915_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
|
||||
|
||||
i915_dri_la_LIBADD = \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
|
||||
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
|
||||
$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.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 \
|
||||
$(top_builddir)/src/gallium/drivers/i915/libi915.la \
|
||||
$(GALLIUM_DRI_LIB_DEPS) \
|
||||
$(INTEL_LIBS)
|
||||
|
||||
include $(top_srcdir)/install-gallium-links.mk
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
|
||||
#include "state_tracker/drm_driver.h"
|
||||
#include "target-helpers/inline_debug_helper.h"
|
||||
#include "i915/drm/i915_drm_public.h"
|
||||
#include "i915/i915_public.h"
|
||||
|
||||
static struct pipe_screen *
|
||||
create_screen(int fd)
|
||||
{
|
||||
struct i915_winsys *iws;
|
||||
struct pipe_screen *screen;
|
||||
|
||||
iws = i915_drm_winsys_create(fd);
|
||||
if (!iws)
|
||||
return NULL;
|
||||
|
||||
screen = i915_screen_create(iws);
|
||||
if (!screen)
|
||||
return NULL;
|
||||
|
||||
screen = debug_screen_wrap(screen);
|
||||
|
||||
return screen;
|
||||
}
|
||||
|
||||
DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen, NULL)
|
||||
|
|
@ -50,6 +50,15 @@ STATIC_TARGET_CPPFLAGS =
|
|||
STATIC_TARGET_LIB_DEPS = \
|
||||
$(top_builddir)/src/loader/libloader.la
|
||||
|
||||
if HAVE_GALLIUM_I915
|
||||
MEGADRIVERS += i915
|
||||
STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915
|
||||
STATIC_TARGET_LIB_DEPS += \
|
||||
$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
|
||||
$(top_builddir)/src/gallium/drivers/i915/libi915.la \
|
||||
$(INTEL_LIBS)
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_NOUVEAU
|
||||
MEGADRIVERS += nouveau
|
||||
STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU
|
||||
|
|
|
|||
Loading…
Reference in New Issue