diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/gallium/targets/xa/Makefile.am | 32 |
2 files changed, 3 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 29426fcbf00..3e56508a530 100644 --- a/configure.ac +++ b/configure.ac @@ -1945,7 +1945,7 @@ if test -n "$with_gallium_drivers"; then gallium_require_drm_loader gallium_require_llvm "Gallium R300" GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" - gallium_check_st "radeon/drm" "dri/r300" "xa/r300" "" "" + gallium_check_st "radeon/drm" "dri/r300" ;; xr600) HAVE_GALLIUM_R600=yes @@ -1962,7 +1962,7 @@ if test -n "$with_gallium_drivers"; then if test "x$enable_opencl" = xyes; then LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" fi - gallium_check_st "radeon/drm" "dri/r600" "xa/r600" "xvmc/r600" "vdpau/r600" "omx/r600" + gallium_check_st "radeon/drm" "dri/r600" "" "xvmc/r600" "vdpau/r600" "omx/r600" ;; xradeonsi) HAVE_GALLIUM_RADEONSI=yes @@ -1971,7 +1971,7 @@ if test -n "$with_gallium_drivers"; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi" radeon_llvm_check "radeonsi" require_egl_drm "radeonsi" - gallium_check_st "radeon/drm" "dri/radeonsi" "xa/radeonsi" "" "vdpau/radeonsi" "omx/radeonsi" + gallium_check_st "radeon/drm" "dri/radeonsi" "" "" "vdpau/radeonsi" "omx/radeonsi" ;; xnouveau) HAVE_GALLIUM_NOUVEAU=yes diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 6a20ae71f9d..73bf664785e 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -80,38 +80,6 @@ STATIC_TARGET_LIB_DEPS += \ $(NOUVEAU_LIBS) endif -if NEED_RADEON_DRM_WINSYS -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la -endif - -if HAVE_GALLIUM_RADEON_COMMON -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/radeon/libradeon.la -endif - -if HAVE_GALLIUM_R300 -STATIC_TARGET_CPPFLAGS += -DGALLIUM_R300 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/r300/libr300.la \ - $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \ - $(RADEON_LIBS) -endif - -if HAVE_GALLIUM_R600 -STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600 -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(RADEON_LIBS) -endif - -if HAVE_GALLIUM_RADEONSI -STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI -STATIC_TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ - $(RADEON_LIBS) -endif - if HAVE_GALLIUM_SVGA STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX STATIC_TARGET_LIB_DEPS += \ |