st/egl: Fix missing symbols.

ximage backend calls gallium_wrap_screen, which requires libidentity.a
and libtrace.a.  There are also some missing symbols in i965 due to the
use of sw wrapper.

7 files changed, 13 insertions, 9 deletions

diff --git a/src/gallium/targets/Makefile.egl b/src/gallium/targets/Makefile.egl
index 30fced7e3c..9265e2eb7b 100644
--- a/src/gallium/targets/Makefile.egl
+++ b/src/gallium/targets/Makefile.egl
@@ -13,8 +13,14 @@ EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o)
 
 common_LIBS = -ldrm -lm -ldl
 
+# ximage backend calls gallium_wrap_screen, which requires libidentity.a and
+# libtrace.a
 x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a \
-	 $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a
+	 $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \
+	 $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+	 $(TOP)/src/gallium/drivers/identity/libidentity.a \
+	 $(TOP)/src/gallium/drivers/trace/libtrace.a
+
 x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
 
 kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a
diff --git a/src/gallium/targets/egl-i915/Makefile b/src/gallium/targets/egl-i915/Makefile
index efaf7b0bef..02258fb69a 100644
--- a/src/gallium/targets/egl-i915/Makefile
+++ b/src/gallium/targets/egl-i915/Makefile
@@ -7,7 +7,6 @@ EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/i915/libi915.a
 
diff --git a/src/gallium/targets/egl-i965/Makefile b/src/gallium/targets/egl-i965/Makefile
index dfb3cc45a7..fad56ef555 100644
--- a/src/gallium/targets/egl-i965/Makefile
+++ b/src/gallium/targets/egl-i965/Makefile
@@ -7,8 +7,10 @@ EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/drivers/i965/libi965.a
+	$(TOP)/src/gallium/drivers/i965/libi965.a \
+	$(TOP)/src/gallium/winsys/sw/drm/libswdrm.a \
+	$(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \
+	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
 
 include ../Makefile.egl
diff --git a/src/gallium/targets/egl-nouveau/Makefile b/src/gallium/targets/egl-nouveau/Makefile
index 3da93790f2..e3fa8937e8 100644
--- a/src/gallium/targets/egl-nouveau/Makefile
+++ b/src/gallium/targets/egl-nouveau/Makefile
@@ -9,7 +9,6 @@ EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
 	$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
 	$(TOP)/src/gallium/drivers/nv50/libnv50.a \
-	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
+	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
 
 include ../Makefile.egl
diff --git a/src/gallium/targets/egl-radeon/Makefile b/src/gallium/targets/egl-radeon/Makefile
index f55d84de81..8daadb5979 100644
--- a/src/gallium/targets/egl-radeon/Makefile
+++ b/src/gallium/targets/egl-radeon/Makefile
@@ -7,7 +7,6 @@ EGL_DRIVER_LIBS = -ldrm_radeon
 
 EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/r300/libr300.a
 
diff --git a/src/gallium/targets/egl-swrast/Makefile b/src/gallium/targets/egl-swrast/Makefile
index 937343defe..7d4f505498 100644
--- a/src/gallium/targets/egl-swrast/Makefile
+++ b/src/gallium/targets/egl-swrast/Makefile
@@ -7,6 +7,6 @@ CFLAGS+="-I$(TOP)/src/gallium/include"
 EGL_DRIVER_NAME = swrast
 EGL_DRIVER_SOURCES = swrast_glue.c
 EGL_DRIVER_LIBS =
-EGL_DRIVER_PIPES = $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
+EGL_DRIVER_PIPES =
 
 include ../Makefile.egl
diff --git a/src/gallium/targets/egl-vmwgfx/Makefile b/src/gallium/targets/egl-vmwgfx/Makefile
index 6db12e03a7..5f9385f42b 100644
--- a/src/gallium/targets/egl-vmwgfx/Makefile
+++ b/src/gallium/targets/egl-vmwgfx/Makefile
@@ -7,7 +7,6 @@ EGL_DRIVER_LIBS =
 
 EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/svga/libsvga.a