Mesa (master): st/dri: Reshuffle files and make it obvious which files are shared
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Thu Mar 25 23:39:23 UTC 2010
Module: Mesa
Branch: master
Commit: 5b1fc14627ae37c5def70e2d5fe28bf7a4becee6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b1fc14627ae37c5def70e2d5fe28bf7a4becee6
Author: Jakob Bornecrantz <wallbraker at gmail.com>
Date: Thu Mar 25 18:29:51 2010 +0100
st/dri: Reshuffle files and make it obvious which files are shared
In short:
git mv ../drisw/Makefile dri/sw
git mv drisw.[c|h] sw
git mv dri2.[c|h] dri1.[c|h] Makefile drm
git rm ../drisw
ln -s <common files> drm/*
ln -s <common files> sw/*
---
configure.ac | 11 +-----
src/gallium/state_trackers/dri/Makefile | 36 ++++---------------
src/gallium/state_trackers/dri/SConscript | 28 ++--------------
src/gallium/state_trackers/dri/drm/Makefile | 33 ++++++++++++++++++
src/gallium/state_trackers/dri/drm/SConscript | 28 +++++++++++++++
src/gallium/state_trackers/dri/{ => drm}/dri1.c | 0
src/gallium/state_trackers/dri/{ => drm}/dri1.h | 0
src/gallium/state_trackers/dri/drm/dri1_helper.c | 1 +
src/gallium/state_trackers/dri/{ => drm}/dri2.c | 0
src/gallium/state_trackers/dri/{ => drm}/dri2.h | 0
src/gallium/state_trackers/dri/drm/dri_context.c | 1 +
src/gallium/state_trackers/dri/drm/dri_drawable.c | 1 +
.../state_trackers/dri/drm/dri_extensions.c | 1 +
src/gallium/state_trackers/dri/drm/dri_screen.c | 1 +
src/gallium/state_trackers/dri/drm/dri_st_api.c | 1 +
.../state_trackers/{drisw => dri/sw}/Makefile | 5 ++-
src/gallium/state_trackers/dri/sw/dri1_helper.c | 1 +
src/gallium/state_trackers/dri/sw/dri_context.c | 1 +
src/gallium/state_trackers/dri/sw/dri_drawable.c | 1 +
src/gallium/state_trackers/dri/sw/dri_extensions.c | 1 +
src/gallium/state_trackers/dri/sw/dri_screen.c | 1 +
src/gallium/state_trackers/dri/sw/dri_st_api.c | 1 +
src/gallium/state_trackers/dri/{ => sw}/drisw.c | 0
src/gallium/state_trackers/dri/{ => sw}/drisw.h | 0
src/gallium/state_trackers/drisw/dri1_helper.c | 1 -
src/gallium/state_trackers/drisw/dri_context.c | 1 -
src/gallium/state_trackers/drisw/dri_drawable.c | 1 -
src/gallium/state_trackers/drisw/dri_extensions.c | 1 -
src/gallium/state_trackers/drisw/dri_screen.c | 1 -
src/gallium/state_trackers/drisw/dri_st_api.c | 1 -
src/gallium/state_trackers/drisw/drisw.c | 1 -
src/gallium/targets/dri-i915/Makefile | 2 +-
src/gallium/targets/dri-i965/Makefile | 2 +-
src/gallium/targets/dri-nouveau/Makefile | 2 +-
src/gallium/targets/dri-radeong/Makefile | 2 +-
src/gallium/targets/dri-swrast/Makefile | 2 +-
src/gallium/targets/dri-vmwgfx/Makefile | 2 +-
37 files changed, 95 insertions(+), 77 deletions(-)
diff --git a/configure.ac b/configure.ac
index d6d952d..caa2cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1204,9 +1204,8 @@ yes)
GALLIUM_STATE_TRACKERS_DIRS=glx
;;
dri)
- GALLIUM_STATE_TRACKERS_DIRS="dri drisw"
+ GALLIUM_STATE_TRACKERS_DIRS="dri"
HAVE_ST_DRI="yes"
- HAVE_ST_DRISW="yes"
if test "x$enable_egl" = xyes; then
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
HAVE_ST_EGL="yes"
@@ -1232,12 +1231,6 @@ yes)
fi
HAVE_ST_DRI="yes"
;;
- drisw)
- if test "x$mesa_driver" != xdri; then
- AC_MSG_ERROR([cannot build drisw state tracker without mesa driver set to dri])
- fi
- HAVE_ST_DRISW="yes"
- ;;
egl)
if test "x$enable_egl" != xyes; then
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
@@ -1409,7 +1402,7 @@ AC_ARG_ENABLE([gallium-swrast],
[enable_gallium_swrast="$enableval"],
[enable_gallium_swrast=auto])
if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then
- if test "x$HAVE_ST_DRISW" = xyes; then
+ if test "x$HAVE_ST_DRI" = xyes; then
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
fi
if test "x$HAVE_ST_EGL" = xyes; then
diff --git a/src/gallium/state_trackers/dri/Makefile b/src/gallium/state_trackers/dri/Makefile
index f1a54e8..72e7057 100644
--- a/src/gallium/state_trackers/dri/Makefile
+++ b/src/gallium/state_trackers/dri/Makefile
@@ -1,32 +1,12 @@
+# src/gallium/state_trackers/dri/Makefile
TOP = ../../../..
include $(TOP)/configs/current
-LIBNAME = dridrm
+SUBDIRS = drm sw
-LIBRARY_INCLUDES = \
- -I$(TOP)/include \
- -I$(TOP)/src/mesa \
- -I$(TOP)/src/mesa/drivers/dri/common \
- -I$(TOP)/src/mesa/main \
- $(shell pkg-config --cflags-only-I libdrm)
-
-
-C_SOURCES = \
- dri_context.c \
- dri_screen.c \
- dri_drawable.c \
- dri_extensions.c \
- dri_st_api.c \
- dri1_helper.c \
- dri1.c \
- dri2.c
-
-# $(TOP)/src/mesa/drivers/dri/common/utils.c \
- $(TOP)/src/mesa/drivers/dri/common/vblank.c \
- $(TOP)/src/mesa/drivers/dri/common/dri_util.c \
- $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c \
- $(TOP)/src/mesa/drivers/common/driverfuncs.c \
- $(TOP)/src/mesa/drivers/dri/common/texmem.c \
- $(TOP)/src/mesa/drivers/dri/common/drirenderbuffer.c
-
-include ../../Makefile.template
+default install clean:
+ @for dir in $(SUBDIRS) ; do \
+ if [ -d $$dir ] ; then \
+ (cd $$dir && $(MAKE) $@) || exit 1; \
+ fi \
+ done
diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript
index 2ca9f42..b4a276c 100644
--- a/src/gallium/state_trackers/dri/SConscript
+++ b/src/gallium/state_trackers/dri/SConscript
@@ -1,27 +1,5 @@
-#######################################################################
-# SConscript for dri state_tracker
-
Import('*')
-if env['dri']:
-
- env = env.Clone()
-
- env.Append(CPPPATH = [
- '#/src/mesa',
- '#/src/mesa/drivers/dri/common',
- ])
-
- st_dri = env.ConvenienceLibrary(
- target = 'st_dri',
- source = [ 'dri_context.c',
- 'dri_drawable.c',
- 'dri_extensions.c',
- 'dri_screen.c',
- 'dri_st_api.c',
- 'dri1_helper.c',
- 'dri1.c',
- 'dri2.c',
- ]
- )
- Export('st_dri')
+SConscript([
+ 'drm/SConscript',
+])
diff --git a/src/gallium/state_trackers/dri/drm/Makefile b/src/gallium/state_trackers/dri/drm/Makefile
new file mode 100644
index 0000000..c43bfee
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/Makefile
@@ -0,0 +1,33 @@
+TOP = ../../../../..
+include $(TOP)/configs/current
+
+LIBNAME = dridrm
+
+LIBRARY_INCLUDES = \
+ -I$(TOP)/include \
+ -I$(TOP)/src/mesa \
+ -I$(TOP)/src/gallium/state_trackers/dri \
+ -I$(TOP)/src/mesa/drivers/dri/common \
+ -I$(TOP)/src/mesa/main \
+ $(shell pkg-config --cflags-only-I libdrm)
+
+
+C_SOURCES = \
+ dri_context.c \
+ dri_screen.c \
+ dri_drawable.c \
+ dri_extensions.c \
+ dri_st_api.c \
+ dri1_helper.c \
+ dri1.c \
+ dri2.c
+
+# $(TOP)/src/mesa/drivers/dri/common/utils.c \
+ $(TOP)/src/mesa/drivers/dri/common/vblank.c \
+ $(TOP)/src/mesa/drivers/dri/common/dri_util.c \
+ $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c \
+ $(TOP)/src/mesa/drivers/common/driverfuncs.c \
+ $(TOP)/src/mesa/drivers/dri/common/texmem.c \
+ $(TOP)/src/mesa/drivers/dri/common/drirenderbuffer.c
+
+include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
new file mode 100644
index 0000000..a9c359c
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -0,0 +1,28 @@
+#######################################################################
+# SConscript for dri state_tracker
+
+Import('*')
+
+if env['dri']:
+
+ env = env.Clone()
+
+ env.Append(CPPPATH = [
+ '#/src/mesa',
+ '#/src/gallium/state_trackers/dri',
+ '#/src/mesa/drivers/dri/common',
+ ])
+
+ st_dri = env.ConvenienceLibrary(
+ target = 'st_dri',
+ source = [ 'dri_context.c',
+ 'dri_drawable.c',
+ 'dri_extensions.c',
+ 'dri_screen.c',
+ 'dri_st_api.c',
+ 'dri1_helper.c',
+ 'dri1.c',
+ 'dri2.c',
+ ]
+ )
+ Export('st_dri')
diff --git a/src/gallium/state_trackers/dri/dri1.c b/src/gallium/state_trackers/dri/drm/dri1.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri1.c
rename to src/gallium/state_trackers/dri/drm/dri1.c
diff --git a/src/gallium/state_trackers/dri/dri1.h b/src/gallium/state_trackers/dri/drm/dri1.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri1.h
rename to src/gallium/state_trackers/dri/drm/dri1.h
diff --git a/src/gallium/state_trackers/dri/drm/dri1_helper.c b/src/gallium/state_trackers/dri/drm/dri1_helper.c
new file mode 120000
index 0000000..7006a8d
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/dri1_helper.c
@@ -0,0 +1 @@
+../dri1_helper.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri2.c
rename to src/gallium/state_trackers/dri/drm/dri2.c
diff --git a/src/gallium/state_trackers/dri/dri2.h b/src/gallium/state_trackers/dri/drm/dri2.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri2.h
rename to src/gallium/state_trackers/dri/drm/dri2.h
diff --git a/src/gallium/state_trackers/dri/drm/dri_context.c b/src/gallium/state_trackers/dri/drm/dri_context.c
new file mode 120000
index 0000000..989ef44
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/dri_context.c
@@ -0,0 +1 @@
+../dri_context.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_drawable.c b/src/gallium/state_trackers/dri/drm/dri_drawable.c
new file mode 120000
index 0000000..422c4c1
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/dri_drawable.c
@@ -0,0 +1 @@
+../dri_drawable.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_extensions.c b/src/gallium/state_trackers/dri/drm/dri_extensions.c
new file mode 120000
index 0000000..b793f06
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/dri_extensions.c
@@ -0,0 +1 @@
+../dri_extensions.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_screen.c b/src/gallium/state_trackers/dri/drm/dri_screen.c
new file mode 120000
index 0000000..938f4c3
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/dri_screen.c
@@ -0,0 +1 @@
+../dri_screen.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_st_api.c b/src/gallium/state_trackers/dri/drm/dri_st_api.c
new file mode 120000
index 0000000..9ae8823
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/dri_st_api.c
@@ -0,0 +1 @@
+../dri_st_api.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/drisw/Makefile b/src/gallium/state_trackers/dri/sw/Makefile
similarity index 79%
rename from src/gallium/state_trackers/drisw/Makefile
rename to src/gallium/state_trackers/dri/sw/Makefile
index dec9a39..35e31e6 100644
--- a/src/gallium/state_trackers/drisw/Makefile
+++ b/src/gallium/state_trackers/dri/sw/Makefile
@@ -1,4 +1,4 @@
-TOP = ../../../..
+TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = drisw
@@ -9,6 +9,7 @@ LIBRARY_INCLUDES = \
-I../dri \
-I$(TOP)/include \
-I$(TOP)/src/mesa \
+ -I$(TOP)/src/gallium/state_trackers/dri \
-I$(TOP)/src/mesa/drivers/dri/common \
-I$(TOP)/src/mesa/main \
-D__NOT_HAVE_DRM_H
@@ -23,4 +24,4 @@ C_SOURCES = \
dri1_helper.c \
drisw.c
-include ../../Makefile.template
+include ../../../Makefile.template
diff --git a/src/gallium/state_trackers/dri/sw/dri1_helper.c b/src/gallium/state_trackers/dri/sw/dri1_helper.c
new file mode 120000
index 0000000..7006a8d
--- /dev/null
+++ b/src/gallium/state_trackers/dri/sw/dri1_helper.c
@@ -0,0 +1 @@
+../dri1_helper.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_context.c b/src/gallium/state_trackers/dri/sw/dri_context.c
new file mode 120000
index 0000000..989ef44
--- /dev/null
+++ b/src/gallium/state_trackers/dri/sw/dri_context.c
@@ -0,0 +1 @@
+../dri_context.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_drawable.c b/src/gallium/state_trackers/dri/sw/dri_drawable.c
new file mode 120000
index 0000000..422c4c1
--- /dev/null
+++ b/src/gallium/state_trackers/dri/sw/dri_drawable.c
@@ -0,0 +1 @@
+../dri_drawable.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_extensions.c b/src/gallium/state_trackers/dri/sw/dri_extensions.c
new file mode 120000
index 0000000..b793f06
--- /dev/null
+++ b/src/gallium/state_trackers/dri/sw/dri_extensions.c
@@ -0,0 +1 @@
+../dri_extensions.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_screen.c b/src/gallium/state_trackers/dri/sw/dri_screen.c
new file mode 120000
index 0000000..938f4c3
--- /dev/null
+++ b/src/gallium/state_trackers/dri/sw/dri_screen.c
@@ -0,0 +1 @@
+../dri_screen.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_st_api.c b/src/gallium/state_trackers/dri/sw/dri_st_api.c
new file mode 120000
index 0000000..9ae8823
--- /dev/null
+++ b/src/gallium/state_trackers/dri/sw/dri_st_api.c
@@ -0,0 +1 @@
+../dri_st_api.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c
similarity index 100%
rename from src/gallium/state_trackers/dri/drisw.c
rename to src/gallium/state_trackers/dri/sw/drisw.c
diff --git a/src/gallium/state_trackers/dri/drisw.h b/src/gallium/state_trackers/dri/sw/drisw.h
similarity index 100%
rename from src/gallium/state_trackers/dri/drisw.h
rename to src/gallium/state_trackers/dri/sw/drisw.h
diff --git a/src/gallium/state_trackers/drisw/dri1_helper.c b/src/gallium/state_trackers/drisw/dri1_helper.c
deleted file mode 120000
index e704e38..0000000
--- a/src/gallium/state_trackers/drisw/dri1_helper.c
+++ /dev/null
@@ -1 +0,0 @@
-../dri/dri1_helper.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/drisw/dri_context.c b/src/gallium/state_trackers/drisw/dri_context.c
deleted file mode 120000
index e4e879d..0000000
--- a/src/gallium/state_trackers/drisw/dri_context.c
+++ /dev/null
@@ -1 +0,0 @@
-../dri/dri_context.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/drisw/dri_drawable.c b/src/gallium/state_trackers/drisw/dri_drawable.c
deleted file mode 120000
index d7f65c8..0000000
--- a/src/gallium/state_trackers/drisw/dri_drawable.c
+++ /dev/null
@@ -1 +0,0 @@
-../dri/dri_drawable.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/drisw/dri_extensions.c b/src/gallium/state_trackers/drisw/dri_extensions.c
deleted file mode 120000
index 60ecde9..0000000
--- a/src/gallium/state_trackers/drisw/dri_extensions.c
+++ /dev/null
@@ -1 +0,0 @@
-../dri/dri_extensions.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/drisw/dri_screen.c b/src/gallium/state_trackers/drisw/dri_screen.c
deleted file mode 120000
index f22c562..0000000
--- a/src/gallium/state_trackers/drisw/dri_screen.c
+++ /dev/null
@@ -1 +0,0 @@
-../dri/dri_screen.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/drisw/dri_st_api.c b/src/gallium/state_trackers/drisw/dri_st_api.c
deleted file mode 120000
index eac8ec6..0000000
--- a/src/gallium/state_trackers/drisw/dri_st_api.c
+++ /dev/null
@@ -1 +0,0 @@
-../dri/dri_st_api.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/drisw/drisw.c b/src/gallium/state_trackers/drisw/drisw.c
deleted file mode 120000
index 258a790..0000000
--- a/src/gallium/state_trackers/drisw/drisw.c
+++ /dev/null
@@ -1 +0,0 @@
-../dri/drisw.c
\ No newline at end of file
diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index facbcb1..822d4b5 100644
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
LIBNAME = i915_dri.so
PIPE_DRIVERS = \
- $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
+ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
$(TOP)/src/gallium/winsys/i915/drm/libinteldrm.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile
index c622bbc..e267ba3 100644
--- a/src/gallium/targets/dri-i965/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
LIBNAME = i965_dri.so
PIPE_DRIVERS = \
- $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
+ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
$(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/winsys/sw/drm/libswdrm.a \
diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile
index 9ba5e18..74d352c 100644
--- a/src/gallium/targets/dri-nouveau/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
LIBNAME = nouveau_dri.so
PIPE_DRIVERS = \
- $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
+ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-radeong/Makefile
index ce25559..66dd392 100644
--- a/src/gallium/targets/dri-radeong/Makefile
+++ b/src/gallium/targets/dri-radeong/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
LIBNAME = radeong_dri.so
PIPE_DRIVERS = \
- $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
+ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
diff --git a/src/gallium/targets/dri-swrast/Makefile b/src/gallium/targets/dri-swrast/Makefile
index 57a9e02..3780da2 100644
--- a/src/gallium/targets/dri-swrast/Makefile
+++ b/src/gallium/targets/dri-swrast/Makefile
@@ -6,7 +6,7 @@ LIBNAME = swrastg_dri.so
DRIVER_DEFINES = -D__NOT_HAVE_DRM_H
PIPE_DRIVERS = \
- $(TOP)/src/gallium/state_trackers/drisw/libdrisw.a \
+ $(TOP)/src/gallium/state_trackers/dri/sw/libdrisw.a \
$(TOP)/src/gallium/winsys/sw/dri/libswdri.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
diff --git a/src/gallium/targets/dri-vmwgfx/Makefile b/src/gallium/targets/dri-vmwgfx/Makefile
index 32edc46..4b002e8 100644
--- a/src/gallium/targets/dri-vmwgfx/Makefile
+++ b/src/gallium/targets/dri-vmwgfx/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
LIBNAME = vmwgfx_dri.so
PIPE_DRIVERS = \
- $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
+ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
$(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/drivers/svga/libsvga.a
More information about the mesa-commit
mailing list