From dde9260fdc1fb6792df24a4790ea1c255ad9284a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 27 Sep 2013 17:03:58 -0700 Subject: [PATCH] mesa: Remove dricore from the build. No driver uses it any more, and it's been replaced by megadrivers. v2: Remove always-on conditional for NEED_LIBPROGRAM (review by Emil) Reviewed-by: Matt Turner (v1) Reviewed-by: Emil Velikov --- configure.ac | 16 ----- src/mesa/Makefile.am | 6 +- src/mesa/drivers/dri/Makefile.am | 2 +- src/mesa/drivers/dri/i965/Makefile.am | 2 +- src/mesa/libdricore/Makefile.am | 85 --------------------------- src/mesa/program/Makefile.am | 14 +---- src/mesa/x86/read_rgba_span_x86.S | 8 --- 7 files changed, 4 insertions(+), 129 deletions(-) delete mode 100644 src/mesa/libdricore/Makefile.am diff --git a/configure.ac b/configure.ac index 30b57bd3397..91b9871d7ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1041,15 +1041,6 @@ if test "x$enable_dri" = xyes; then DRI_DRIVER_LDFLAGS="-module -avoid-version -shared -Wl,-Bsymbolic" fi -enable_dricore=no - -# megadriver wants to use libmesa.la, while non-megadrivers want to -# automatically get libdricore. Some day hopefully we'll transition -# everything to megadriver. -MEGADRIVER_DRI_LIB_DEPS=$DRI_LIB_DEPS -DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la $DRI_LIB_DEPS" - -AM_CONDITIONAL(NEED_LIBDRICORE, test "x$enable_dricore" = xyes) AM_CONDITIONAL(NEED_MEGADRIVER, test -n "$DRI_DIRS") AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_xlib_glx" = xyes -o \ "x$enable_osmesa" = xyes -o \ @@ -1057,7 +1048,6 @@ AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_xlib_glx" = xyes -o \ AC_SUBST([EXPAT_INCLUDES]) AC_SUBST([DRI_LIB_DEPS]) AC_SUBST([DRI_DRIVER_LDFLAGS]) -AC_SUBST([MEGADRIVER_DRI_LIB_DEPS]) AC_SUBST([GALLIUM_DRI_LIB_DEPS]) case $DRI_DIRS in @@ -1966,11 +1956,6 @@ AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1) AC_SUBST([ELF_LIB]) AM_CONDITIONAL(DRICOMMON_NEED_LIBDRM, test "x$DRICOMMON_NEED_LIBDRM" = xyes) -AM_CONDITIONAL(NEED_LIBPROGRAM, test "x$with_gallium_drivers" != x -o \ - "x$enable_xlib_glx" = xyes -o \ - "x$enable_osmesa" = xyes -o \ - -n "$DRI_DIRS" -o \ - "x$enable_gallium_osmesa" = xyes) AM_CONDITIONAL(HAVE_X11_DRIVER, test "x$enable_xlib_glx" = xyes) AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_OSMESA, test "x$enable_gallium_osmesa" = xyes) @@ -2133,7 +2118,6 @@ AC_CONFIG_FILES([Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/osmesa.pc src/mesa/drivers/x11/Makefile - src/mesa/libdricore/Makefile src/mesa/main/tests/Makefile src/mesa/main/tests/hash_table/Makefile src/mesa/program/Makefile diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index e9c16e78ed4..f86caee351e 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -19,11 +19,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -if NEED_LIBDRICORE -DRICORE_SUBDIR = libdricore -endif - -SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) main/tests +SUBDIRS = program x86 x86-64 . main/tests if HAVE_X11_DRIVER SUBDIRS += drivers/x11 diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am index aee6990c439..a85a5aa91ee 100644 --- a/src/mesa/drivers/dri/Makefile.am +++ b/src/mesa/drivers/dri/Makefile.am @@ -59,7 +59,7 @@ mesa_dri_drivers_la_LIBADD = \ common/libmegadriver_stub.la \ common/libdricommon.la \ $(MEGADRIVERS_DEPS) \ - $(MEGADRIVER_DRI_LIB_DEPS) \ + $(DRI_LIB_DEPS) \ $() if NEED_MEGADRIVER diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 589a0742b1a..8c0f9a324e3 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -46,7 +46,7 @@ TEST_LIBS = \ libi965_dri.la \ ../common/libdricommon.la \ ../common/libmegadriver_stub.la \ - $(MEGADRIVER_DRI_LIB_DEPS) \ + $(DRI_LIB_DEPS) \ ../../../libmesa.la \ -lrt \ ../common/libdri_test_stubs.la diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am deleted file mode 100644 index 686e478734f..00000000000 --- a/src/mesa/libdricore/Makefile.am +++ /dev/null @@ -1,85 +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. - -SRCDIR=$(top_srcdir)/src/mesa/ -BUILDDIR=$(top_builddir)/src/mesa/ -include ../Makefile.sources -include ../../glsl/Makefile.sources - -noinst_PROGRAMS = - -AM_CPPFLAGS = \ - $(INCLUDE_DIRS) \ - $(DEFINES) \ - -DUSE_DRICORE - -libdricore@VERSION@_la_SOURCES = \ - $(MESA_FILES) \ - $(LIBGLCPP_GENERATED_FILES) \ - $(LIBGLCPP_FILES) \ - $(LIBGLSL_GENERATED_CXX_FILES) \ - $(LIBGLSL_FILES) -libdricore@VERSION@_la_LDFLAGS = \ - -version-number 1:0 \ - -Wl,-Bsymbolic \ - $() - -libdricore@VERSION@_la_LIBADD = \ - ../program/libdricore_program.la \ - $() - -if HAVE_X86_ASM -libdricore@VERSION@_la_SOURCES += $(X86_FILES) -AM_CPPFLAGS += \ - -I$(top_builddir)/src/mesa/x86 \ - -I$(top_srcdir)/src/mesa/x86 -endif - -if HAVE_X86_64_ASM -libdricore@VERSION@_la_SOURCES += $(X86_64_FILES) -AM_CPPFLAGS += \ - -I$(top_builddir)/src/mesa/x86-64 \ - -I$(top_srcdir)/src/mesa/x86-64 -endif - -if HAVE_SPARC_ASM -libdricore@VERSION@_la_SOURCES += $(SPARC_FILES) -AM_CPPFLAGS += \ - -I$(top_builddir)/src/mesa/sparc \ - -I$(top_srcdir)/src/mesa/sparc -endif - -if HAVE_DRI -lib_LTLIBRARIES = libdricore@VERSION@.la - -# 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: libdricore@VERSION@.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1; - ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so -endif - -CLEANFILES = \ - $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \ - $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so - --include $(DEPENDS) diff --git a/src/mesa/program/Makefile.am b/src/mesa/program/Makefile.am index ab565e25182..5e05782fbed 100644 --- a/src/mesa/program/Makefile.am +++ b/src/mesa/program/Makefile.am @@ -24,25 +24,13 @@ include ../Makefile.sources AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS) AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) -libdricore_program_la_CFLAGS = $(NOVISIBILITY_CFLAGS) -libdricore_program_la_CXXFLAGS = $(NOVISIBILITY_CXXFLAGS) SRCDIR = $(top_srcdir)/src/mesa/ BUILDDIR = $(top_builddir)/src/mesa/ -if NEED_LIBDRICORE -DRICORE_LIB = libdricore_program.la -endif - -noinst_LTLIBRARIES = $(DRICORE_LIB) -if NEED_LIBPROGRAM -noinst_LTLIBRARIES += libprogram.la -else -check_LTLIBRARIES = libprogram.la -endif +noinst_LTLIBRARIES = libprogram.la libprogram_la_SOURCES = $(PROGRAM_FILES) -libdricore_program_la_SOURCES = $(PROGRAM_FILES) lex.yy.c: program_lexer.l $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S index 3be4515b114..81772997371 100644 --- a/src/mesa/x86/read_rgba_span_x86.S +++ b/src/mesa/x86/read_rgba_span_x86.S @@ -77,9 +77,7 @@ */ .globl _generic_read_RGBA_span_BGRA8888_REV_MMX -#ifndef USE_DRICORE .hidden _generic_read_RGBA_span_BGRA8888_REV_MMX -#endif .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function _generic_read_RGBA_span_BGRA8888_REV_MMX: pushl %ebx @@ -174,9 +172,7 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX: */ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE -#ifndef USE_DRICORE .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE -#endif .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function _generic_read_RGBA_span_BGRA8888_REV_SSE: pushl %esi @@ -339,9 +335,7 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE: .text .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2 -#ifndef USE_DRICORE .hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2 -#endif .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function _generic_read_RGBA_span_BGRA8888_REV_SSE2: pushl %esi @@ -500,9 +494,7 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2: .text .globl _generic_read_RGBA_span_RGB565_MMX -#ifndef USE_DRICORE .hidden _generic_read_RGBA_span_RGB565_MMX -#endif .type _generic_read_RGBA_span_RGB565_MMX, @function _generic_read_RGBA_span_RGB565_MMX: -- 2.30.2